h264: rename h264.[ch] to h264dec.[ch]

This is more consistent with the naming of other decoders.

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1f2096cf86a55866eb692217c970193a7ca1e113..622e1007ee7fa70ee24b1d725433f3e0342da55d 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -249,7 +249,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/dxva2_h264.c b/libavcodec/dxva2_h264.c
index e2e987d259c395295a07d0f3de7efca84363920f..c2ff15baaba2607ddc059f5e9aa09ae7d58df2c2 100644 (file)
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#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 783bc0f5c9427928517b12666e3457622c0e2371..203803fbdf72356f4571f599db41a494324ab754 100644 (file)
--- a/libavcodec/h264_cabac.c
+++ b/libavcodec/h264_cabac.c
@@ -35,7 +35,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 dabd61cd79eea34c32fcde4c851ec239a524fc5a..4fa2de01844aed07f11845486220208b6cd5a171 100644 (file)
--- a/libavcodec/h264_cavlc.c
+++ b/libavcodec/h264_cavlc.c
@@ -29,7 +29,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 177ec10d554389a9c371608bd4675a1f28fec6fd..d0d16e9793f62139418777e4dab722c4331e7c4b 100644 (file)
--- 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 2bac17a3d43668d61f733bc02644bce067a82d6e..71334e90b265e32958bdfe656715797f0f593dd9 100644 (file)
--- 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 6f3c719ce0218e47b06cea6b1a74163bed25e56c..55bf1c35e03c9cb0dee447f42cf119a6fe2adeb0 100644 (file)
--- 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 0c8a925d1dd67ef55a32ab9c292ce393b822661a..7e6f62f10ada2ae4fed7c0e7ad4c2e6383c06685 100644 (file)
--- 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 e9d2b62208aebd22d484d5502b19ccf9de06970e..83b1ea6a71a8ad778f51b013e0a07ca1d535c811 100644 (file)
--- 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 <assert.h>

diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index 052e8e41d9bcb2eaf3f5ca290d9d8cf3438923eb..be75b054e620b845c228cd1a1efd34459495f174 100644 (file)
--- 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 b86bf2b9b72e0f06de4ed59e6c5185329c7dc685..c4741833666d5c07d3f736e8b6379e1317f0add3 100644 (file)
--- a/libavcodec/h264_parser.c
+++ b/libavcodec/h264_parser.c
@@ -36,7 +36,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 cd7ff82d71602913ad3616f759b2bf6f66932e9d..e22852a24fa4a4df04f3e95d58a21dd614f03b34 100644 (file)
--- 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 8d567cad2581fef01caceada1d58e9b5ca880a0d..9b39992c1073384cd2ea0463c308836d41405a2e 100644 (file)
--- 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 f7b7211a5c2261070d4ab135d72b9e687d9de3b9..d6dee7a2900e7a0d0dadf8f4c6ae381da1d6d4db 100644 (file)
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -29,7 +29,7 @@
 
 #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 0e3952d2c985a504b07f6cabed0af8592155e6da..380e86c983f5c202136964e6b5e4e4a0e41f7a61 100644 (file)
--- 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 6a89a416ac31a94e9d8e5410b4f73d41bc27c56e..d49c619a224f4a3f66ca330946988264cd463860 100644 (file)
--- 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 79c5b57cbc4a01493b92a89a1c6fbda795d487dd..a2a4a47036b9101c78bd4bed99e027e8e3aca428 100644 (file)
--- 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 ab96f0835acfb80a41d562fcfb25a8624c1dbbae..f1284e6b697987bb70b29089ed8341a93a8af7ab 100644 (file)
--- 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
similarity index 99%
rename from libavcodec/h264.c
rename to libavcodec/h264dec.c
index 7949ee66ac5195c2996ff0bc1daf1f7e403cd344..6eb2da8665a424619192e471733e8ba1c9e38f63 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264dec.c
@@ -36,7 +36,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
similarity index 99%
rename from libavcodec/h264.h
rename to libavcodec/h264dec.h
index 398a2837b80001e925a617dc2421c835d8ca302c..300077d7f22cfbe696b0e90e4d94767ef03bc310 100644 (file)
--- 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"
@@ -935,4 +935,4 @@ void ff_h264_flush_change(H264Context *h);
 
 void ff_h264_free_tables(H264Context *h);
 
-#endif /* AVCODEC_H264_H */
+#endif /* AVCODEC_H264DEC_H */

diff --git a/libavcodec/h264idct_template.c b/libavcodec/h264idct_template.c
index 83c2a959b2b624878f996b7562a18a12b3954849..08a71cd4e96643bf49cc86537681571b8554c440 100644 (file)
--- 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/omx.c b/libavcodec/omx.c
index 961ff867641fe148ed492654cbb1ebf8bc2c1866..d556a202e32b51aa6aa1abf2a58dee4eb3bd7834 100644 (file)
--- 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 ce514e3d861cce5fe7969b2e02a6614dd9b507e4..0538dbceed9b612cf5ffdb59bfcd3d3eb1c429a0 100644 (file)
--- 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 && HAVE_BIGENDIAN

diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 7f4fb8126f30d1ecbcf61bae1bef3d6aec70cb46..035f9c65f6f092d57f7a1da2c8ca1b2d51a2ff45 100644 (file)
--- 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 9dc1fb5d0245923040e33c52da6727caa86c5876..bf68389b5bb2924cd6b9ad774e41b7a986198ee8 100644 (file)
--- 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.c b/libavcodec/vaapi.c
index 094692e2a2f48999f970b3aa9119a30a0cce0068..d2aafac38e46b28d5f4be1558bb7a03c26e9e597 100644 (file)
--- a/libavcodec/vaapi.c
+++ b/libavcodec/vaapi.c
@@ -21,7 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "h264.h"
+#include "h264dec.h"
 #include "mpegvideo.h"
 #include "vaapi_internal.h"
 

diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index a2889806f9993567ab2fed51f76e0112e89425b8..95450f8edcb9402e73e71920cedbfa4fcc25fb1a 100644 (file)
--- 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 0925985235cc835fb96fbb1d2aa45e085f3011ff..cd32bbbeb2a963424cca8a6e9a52009442358dea 100644 (file)
--- 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 8ae979220062f414f40070d5b17bd47b25d5ae06..037715da810214bed8598f9b2b2fabe6c388ba2f 100644 (file)
--- a/libavcodec/vda_h264.c
+++ b/libavcodec/vda_h264.c
@@ -25,7 +25,7 @@
 #include <CoreFoundation/CFString.h>
 
 #include "libavutil/avutil.h"
-#include "h264.h"
+#include "h264dec.h"
 #include "internal.h"
 #include "vda.h"
 #include "vda_internal.h"

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index b7784393dfd3ae9c97029a95cb2e04e6dc23646b..f638d201159dd8168242e01acce3fdb211c37e41 100644 (file)
--- 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_internal.h"

diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index c34e323197fff18fec187899270b30b75330057f..34dc630efcc3cc8160702dfe77ab681520cd5290 100644 (file)
--- 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/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 76d2ab05d5c026f3537e477565d0de20c6ffcd87..541ebb2a0409d4140c17741f68c58c034dff1e2f 100644 (file)
--- 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"