[FFmpeg-cvslog] h264: rename h264.[ch] to h264dec.[ch]

Anton Khirnov git at videolan.org
Fri Jul 29 12:07:08 EEST 2016 

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed May 18 09:02:39 2016 +0200| [9df889a5f116c1ee78c2f239e0ba599c492431aa] | committer: Anton Khirnov

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

This is more consistent with the naming of other decoders.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9df889a5f116c1ee78c2f239e0ba599c492431aa
---

 libavcodec/Makefile              | 2 +-
 libavcodec/dxva2_h264.c          | 2 +-
 libavcodec/h264_cabac.c          | 2 +-
 libavcodec/h264_cavlc.c          | 2 +-
 libavcodec/h264_direct.c         | 2 +-
 libavcodec/h264_loopfilter.c     | 2 +-
 libavcodec/h264_mb.c             | 2 +-
 libavcodec/h264_mc_template.c    | 2 +-
 libavcodec/h264_mvpred.h         | 2 +-
 libavcodec/h264_parse.c          | 2 +-
 libavcodec/h264_parser.c         | 2 +-
 libavcodec/h264_picture.c        | 2 +-
 libavcodec/h264_ps.c             | 2 +-
 libavcodec/h264_refs.c           | 2 +-
 libavcodec/h264_sei.c            | 2 +-
 libavcodec/h264_slice.c          | 2 +-
 libavcodec/h264data.c            | 2 +-
 libavcodec/h264data.h            | 2 +-
 libavcodec/{h264.c => h264dec.c} | 2 +-
 libavcodec/{h264.h => h264dec.h} | 6 +++---
 libavcodec/h264idct_template.c   | 2 +-
 libavcodec/omx.c                 | 2 +-
 libavcodec/ppc/h264dsp.c         | 2 +-
 libavcodec/qsvenc_h264.c         | 2 +-
 libavcodec/svq3.c                | 2 +-
 libavcodec/vaapi.c               | 2 +-
 libavcodec/vaapi_encode_h264.c   | 2 +-
 libavcodec/vaapi_h264.c          | 2 +-
 libavcodec/vda_h264.c            | 2 +-
 libavcodec/vdpau.c               | 2 +-
 libavcodec/vdpau_h264.c          | 2 +-
 libavcodec/x86/h264_qpel.c       | 2 +-
 32 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 1f2096c..622e100 100644
--- 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 e2e987d..c2ff15b 100644
--- 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 783bc0f..203803f 100644
--- 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 dabd61c..4fa2de0 100644
--- 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 177ec10..d0d16e9 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 2bac17a..71334e9 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 6f3c719..55bf1c3 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 0c8a925..7e6f62f 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 e9d2b62..83b1ea6 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 <assert.h>
diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c
index 052e8e4..be75b05 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 b86bf2b..c474183 100644
--- 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 cd7ff82..e22852a 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 8d567ca..9b39992 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 f7b7211..d6dee7a 100644
--- 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 0e3952d..380e86c 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 6a89a41..d49c619 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 79c5b57..a2a4a47 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 ab96f08..f1284e6 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
similarity index 99%
rename from libavcodec/h264.c
rename to libavcodec/h264dec.c
index 7949ee6..6eb2da8 100644
--- 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 398a283..300077d 100644
--- a/libavcodec/h264.h
+++ b/libavcodec/h264dec.h
@@ -25,8 +25,8 @@
  * @author Michael Niedermayer <michaelni at 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 83c2a95..08a71cd 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/omx.c b/libavcodec/omx.c
index 961ff86..d556a20 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 ce514e3..0538dbc 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 && HAVE_BIGENDIAN
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 7f4fb81..035f9c6 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 9dc1fb5..bf68389 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.c b/libavcodec/vaapi.c
index 094692e..d2aafac 100644
--- 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 a288980..95450f8 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 0925985..cd32bbb 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 8ae9792..037715d 100644
--- 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 b778439..f638d20 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_internal.h"
diff --git a/libavcodec/vdpau_h264.c b/libavcodec/vdpau_h264.c
index c34e323..34dc630 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/x86/h264_qpel.c b/libavcodec/x86/h264_qpel.c
index 76d2ab0..541ebb2 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"

More information about the ffmpeg-cvslog mailing list