Merge commit '9df889a5f116c1ee78c2f239e0ba599c492431aa'

* commit '9df889a5f116c1ee78c2f239e0ba599c492431aa':
  h264: rename h264.[ch] to h264dec.[ch]

Merged-by: Clément Bœsch <u@pkh.me>

39 files changed, 41 insertions, 41 deletions

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3def3ad1f8..33ac2b3b36 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -309,7 +309,7 @@ OBJS-$(CONFIG_H263_DECODER)            += h263dec.o h263.o ituh263dec.o        \
                                           intelh263dec.o h263data.o
 OBJS-$(CONFIG_H263_ENCODER)            += mpeg4videoenc.o mpeg4video.o  \
                                           h263.o ituh263enc.o flvenc.o h263data.o
-OBJS-$(CONFIG_H264_DECODER)            += h264.o h264_cabac.o h264_cavlc.o \
+OBJS-$(CONFIG_H264_DECODER)            += h264dec.o h264_cabac.o h264_cavlc.o \
                                           h264_direct.o h264_loopfilter.o  \
                                           h264_mb.o h264_picture.o h264_ps.o \
                                           h264_refs.o h264_sei.o \
diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c
index 3cb32a8c59..d6ebcee25d 100644
--- a/libavcodec/crystalhd.c
+++ b/libavcodec/crystalhd.c
@@ -83,7 +83,7 @@
 #include <libcrystalhd/libcrystalhd_if.h>
 
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "internal.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 84a8e6c3c9..9ed9c75405 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -22,7 +22,7 @@
 
 #include "libavutil/avassert.h"
 
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 #include "mpegutils.h"
 
diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c
index c8523af1b5..5776be9dab 100644
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -37,7 +37,7 @@
 #include "cabac_functions.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 #include "h264_mvpred.h"
 #include "mpegutils.h"
diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c
index 16b079eb99..069b52129c 100644
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -30,7 +30,7 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264_mvpred.h"
 #include "h264data.h"
 #include "golomb.h"
diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c
index e137ff9227..a1e5c04de7 100644
--- a/libavcodec/h264_direct.c
+++ b/libavcodec/h264_direct.c
@@ -27,7 +27,7 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "mpegutils.h"
 #include "rectangle.h"
 #include "thread.h"
diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c
index 62a82c9db8..19a8851898 100644
--- a/libavcodec/h264_loopfilter.c
+++ b/libavcodec/h264_loopfilter.c
@@ -29,7 +29,7 @@
 #include "libavutil/intreadwrite.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "mathops.h"
 #include "mpegutils.h"
 #include "rectangle.h"
diff --git a/libavcodec/h264_mb.c b/libavcodec/h264_mb.c
index e33a59e4ca..edccf4d88c 100644
--- a/libavcodec/h264_mb.c
+++ b/libavcodec/h264_mb.c
@@ -31,7 +31,7 @@
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "qpeldsp.h"
 #include "thread.h"
 
diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c
index cd4a04e082..58c05044c1 100644
--- a/libavcodec/h264_mc_template.c
+++ b/libavcodec/h264_mc_template.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "h264.h"
+#include "h264dec.h"
 
 #undef MCFUNC
 
diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h
index be02e5af9b..24f250d794 100644
--- a/libavcodec/h264_mvpred.h
+++ b/libavcodec/h264_mvpred.h
@@ -30,7 +30,7 @@
 
 #include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "mpegutils.h"
 #include "libavutil/avassert.h"
 
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index b7f9a2eaec..052298b289 100644
--- a/libavcodec/h264_parse.c
+++ b/libavcodec/h264_parse.c
@@ -19,7 +19,7 @@
 #include "bytestream.h"
 #include "get_bits.h"
 #include "golomb.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264_parse.h"
 
 int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps,
diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c
index ce46c58dda..e2ca60ff10 100644
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -38,7 +38,7 @@
 
 #include "get_bits.h"
 #include "golomb.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264_sei.h"
 #include "h264data.h"
 #include "internal.h"
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c
index 6426b54ab3..f634d2a1a7 100644
--- a/libavcodec/h264_picture.c
+++ b/libavcodec/h264_picture.c
@@ -33,7 +33,7 @@
 #include "cabac_functions.h"
 #include "error_resilience.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 #include "h264chroma.h"
 #include "h264_mvpred.h"
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c
index 7d1cf19271..8bc8f1fd9b 100644
--- a/libavcodec/h264_ps.c
+++ b/libavcodec/h264_ps.c
@@ -31,7 +31,7 @@
 #include "internal.h"
 #include "mathops.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 #include "golomb.h"
 
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 730471b21b..4246e8702e 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -30,7 +30,7 @@
 #include "libavutil/avassert.h"
 #include "internal.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "golomb.h"
 #include "mpegutils.h"
 
diff --git a/libavcodec/h264_sei.c b/libavcodec/h264_sei.c
index 3bdbaa0097..6332af51cd 100644
--- a/libavcodec/h264_sei.c
+++ b/libavcodec/h264_sei.c
@@ -28,7 +28,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "golomb.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264_sei.h"
 #include "internal.h"
 
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index 66e3c885f9..e70f2ee4eb 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -35,7 +35,7 @@
 #include "cabac_functions.h"
 #include "error_resilience.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 #include "h264chroma.h"
 #include "h264_mvpred.h"
diff --git a/libavcodec/h264data.c b/libavcodec/h264data.c
index da203a95e0..a4c6d93cf0 100644
--- a/libavcodec/h264data.c
+++ b/libavcodec/h264data.c
@@ -31,7 +31,7 @@
 #include "libavutil/avutil.h"
 
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 
 const uint8_t ff_h264_golomb_to_pict_type[5] = {
diff --git a/libavcodec/h264data.h b/libavcodec/h264data.h
index 988352aa9a..2968b08b7e 100644
--- a/libavcodec/h264data.h
+++ b/libavcodec/h264data.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>
 
-#include "h264.h"
+#include "h264dec.h"
 
 extern const uint8_t ff_h264_golomb_to_pict_type[5];
 extern const uint8_t ff_h264_golomb_to_intra4x4_cbp[48];
diff --git a/libavcodec/h264.c b/libavcodec/h264dec.c
index 6f71d78f73..8e07e7eb10 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264dec.c
@@ -39,7 +39,7 @@
 #include "cabac_functions.h"
 #include "error_resilience.h"
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h2645_parse.h"
 #include "h264data.h"
 #include "h264chroma.h"
diff --git a/libavcodec/h264.h b/libavcodec/h264dec.h
index 3413acef01..009a86104a 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264dec.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni@gmx.at>
  */
 
-#ifndef AVCODEC_H264_H
-#define AVCODEC_H264_H
+#ifndef AVCODEC_H264DEC_H
+#define AVCODEC_H264DEC_H
 
 #include "libavutil/buffer.h"
 #include "libavutil/intreadwrite.h"
@@ -1005,4 +1005,4 @@ void ff_h264_free_tables(H264Context *h);
 
 void ff_h264_set_erpic(ERPicture *dst, H264Picture *src);
 
-#endif /* AVCODEC_H264_H */
+#endif /* AVCODEC_H264DEC_H */
diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c
index abf888ed96..a90c407388 100644
--- a/libavcodec/h264idct_template.c
+++ b/libavcodec/h264idct_template.c
@@ -27,7 +27,7 @@
 
 #include "bit_depth_template.c"
 #include "libavutil/common.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264idct.h"
 
 void FUNCC(ff_h264_idct_add)(uint8_t *_dst, int16_t *_block, int stride)
diff --git a/libavcodec/mediacodecdec_h264.c b/libavcodec/mediacodecdec_h264.c
index caeb64b294..18f186b8fa 100644
--- a/libavcodec/mediacodecdec_h264.c
+++ b/libavcodec/mediacodecdec_h264.c
@@ -32,7 +32,7 @@
 #include "libavutil/atomic.h"
 
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "internal.h"
 #include "mediacodecdec.h"
 #include "mediacodec_wrapper.h"
diff --git a/libavcodec/mips/h264chroma_mips.h b/libavcodec/mips/h264chroma_mips.h
index 0ef6c74691..6e6127d8a7 100644
--- a/libavcodec/mips/h264chroma_mips.h
+++ b/libavcodec/mips/h264chroma_mips.h
@@ -21,7 +21,7 @@
 #ifndef AVCODEC_MIPS_H264CHROMA_MIPS_H
 #define AVCODEC_MIPS_H264CHROMA_MIPS_H
 
-#include "libavcodec/h264.h"
+#include "libavcodec/h264dec.h"
 void ff_put_h264_chroma_mc8_msa(uint8_t *dst, uint8_t *src, int stride,
                                 int height, int x, int y);
 void ff_put_h264_chroma_mc4_msa(uint8_t *dst, uint8_t *src, int stride,
diff --git a/libavcodec/mips/h264dsp_mips.h b/libavcodec/mips/h264dsp_mips.h
index 2fdfd11d95..a578457bd2 100644
--- a/libavcodec/mips/h264dsp_mips.h
+++ b/libavcodec/mips/h264dsp_mips.h
@@ -22,7 +22,7 @@
 #ifndef AVCODEC_MIPS_H264DSP_MIPS_H
 #define AVCODEC_MIPS_H264DSP_MIPS_H
 
-#include "libavcodec/h264.h"
+#include "libavcodec/h264dec.h"
 #include "constants.h"
 
 void ff_h264_h_lpf_luma_inter_msa(uint8_t *src, int stride,
diff --git a/libavcodec/omx.c b/libavcodec/omx.c
index 1b2ae0d997..665ec1d7fb 100644
--- a/libavcodec/omx.c
+++ b/libavcodec/omx.c
@@ -41,7 +41,7 @@
 #include "libavutil/opt.h"
 
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "internal.h"
 
 #ifdef OMX_SKIP64BIT
diff --git a/libavcodec/ppc/h264dsp.c b/libavcodec/ppc/h264dsp.c
index 1bc8058a17..22a8d4117b 100644
--- a/libavcodec/ppc/h264dsp.c
+++ b/libavcodec/ppc/h264dsp.c
@@ -31,7 +31,7 @@
 #include "libavutil/ppc/types_altivec.h"
 #include "libavutil/ppc/util_altivec.h"
 
-#include "libavcodec/h264.h"
+#include "libavcodec/h264dec.h"
 #include "libavcodec/h264dsp.h"
 
 #if HAVE_ALTIVEC
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 3fb5ca3cf7..dcf2a6a56e 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -30,7 +30,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "qsv.h"
 #include "qsv_internal.h"
 #include "qsvenc.h"
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index a927063f9f..00131e3d3e 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -46,7 +46,7 @@
 #include "internal.h"
 #include "avcodec.h"
 #include "mpegutils.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264data.h"
 #include "golomb.h"
 #include "hpeldsp.h"
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index d576edec06..99b76c0f13 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -25,7 +25,7 @@
 #include "libavutil/pixfmt.h"
 
 #include "avcodec.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "h264_sei.h"
 #include "internal.h"
 #include "vaapi_encode.h"
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index 92efb26a01..d7aba2dd01 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -21,7 +21,7 @@
  */
 
 #include "vaapi_internal.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "mpegutils.h"
 
 /**
diff --git a/libavcodec/vda_h264.c b/libavcodec/vda_h264.c
index 8c526c0754..7b88ec7015 100644
--- a/libavcodec/vda_h264.c
+++ b/libavcodec/vda_h264.c
@@ -26,7 +26,7 @@
 
 #include "vda.h"
 #include "libavutil/avutil.h"
-#include "h264.h"
+#include "h264dec.h"
 
 struct vda_buffer {
     CVPixelBufferRef cv_buffer;
diff --git a/libavcodec/vda_h264_dec.c b/libavcodec/vda_h264_dec.c
index a196eb7228..92839e2d39 100644
--- a/libavcodec/vda_h264_dec.c
+++ b/libavcodec/vda_h264_dec.c
@@ -28,7 +28,7 @@
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "vda.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "avcodec.h"
 
 #ifndef kCFCoreFoundationVersionNumber10_7
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 1d4c1ce743..bbb9913f8b 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -25,7 +25,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "vc1.h"
 #include "vdpau.h"
 #include "vdpau_compat.h"
diff --git a/libavcodec/vdpau_compat.h b/libavcodec/vdpau_compat.h
index 6b4b0865c9..768acce78c 100644
--- a/libavcodec/vdpau_compat.h
+++ b/libavcodec/vdpau_compat.h
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 
-#include "h264.h"
+#include "h264dec.h"
 #include "mpeg4video.h"
 
 void ff_vdpau_add_data_chunk(uint8_t *data, const uint8_t *buf,
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index 5ae34490b5..15f50f07c3 100644
--- a/libavcodec/vdpau_h264.c
+++ b/libavcodec/vdpau_h264.c
@@ -25,7 +25,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "mpegutils.h"
 #include "vdpau.h"
 #include "vdpau_internal.h"
diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c
index c2c621db60..1288aa5087 100644
--- a/libavcodec/videotoolbox.c
+++ b/libavcodec/videotoolbox.c
@@ -29,7 +29,7 @@
 #include "vda_vt_internal.h"
 #include "libavutil/avutil.h"
 #include "bytestream.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "mpegvideo.h"
 
 #ifndef kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder
diff --git a/libavcodec/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index d759e888a5..8c4b1e1288 100644
--- a/libavcodec/x86/h264_qpel.c
+++ b/libavcodec/x86/h264_qpel.c
@@ -23,7 +23,7 @@
 #include "libavutil/cpu.h"
 #include "libavutil/x86/asm.h"
 #include "libavutil/x86/cpu.h"
-#include "libavcodec/h264.h"
+#include "libavcodec/h264dec.h"
 #include "libavcodec/h264qpel.h"
 #include "libavcodec/pixels.h"
 #include "fpel.h"
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
index 80318b8903..f256f67295 100644
--- a/libavformat/mxfenc.c
+++ b/libavformat/mxfenc.c
@@ -48,7 +48,7 @@
 #include "libavutil/time_internal.h"
 #include "libavcodec/bytestream.h"
 #include "libavcodec/dnxhddata.h"
-#include "libavcodec/h264.h"
+#include "libavcodec/h264dec.h"
 #include "libavcodec/internal.h"
 #include "audiointerleave.h"
 #include "avformat.h"