From 9df889a5f116c1ee78c2f239e0ba599c492431aa Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 18 May 2016 09:02:39 +0200 Subject: [PATCH] h264: rename h264.[ch] to h264dec.[ch] This is more consistent with the naming of other decoders. --- 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(-) rename libavcodec/{h264.c => h264dec.c} (99%) rename libavcodec/{h264.h => h264dec.h} (99%) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1f2096cf86a..622e1007ee7 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 e2e987d259c..c2ff15baaba 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 783bc0f5c94..203803fbdf7 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 dabd61cd79e..4fa2de01844 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 177ec10d554..d0d16e9793f 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 2bac17a3d43..71334e90b26 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 6f3c719ce02..55bf1c35e03 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 0c8a925d1dd..7e6f62f10ad 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 e9d2b62208a..83b1ea6a71a 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 diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 052e8e41d9b..be75b054e62 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 b86bf2b9b72..c4741833666 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 cd7ff82d716..e22852a24fa 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 8d567cad258..9b39992c107 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 f7b7211a5c2..d6dee7a2900 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 0e3952d2c98..380e86c983f 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 6a89a416ac3..d49c619a224 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 79c5b57cbc4..a2a4a47036b 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 ab96f0835ac..f1284e6b697 100644 --- a/libavcodec/h264data.h +++ b/libavcodec/h264data.h @@ -21,7 +21,7 @@ #include -#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 7949ee66ac5..6eb2da8665a 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 398a2837b80..300077d7f22 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264dec.h @@ -25,8 +25,8 @@ * @author Michael Niedermayer */ -#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 83c2a959b2b..08a71cd4e96 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 961ff867641..d556a202e32 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 ce514e3d861..0538dbceed9 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 7f4fb8126f3..035f9c65f6f 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 9dc1fb5d024..bf68389b5bb 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 094692e2a2f..d2aafac38e4 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 a2889806f99..95450f8edcb 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 0925985235c..cd32bbbeb2a 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 8ae97922006..037715da810 100644 --- a/libavcodec/vda_h264.c +++ b/libavcodec/vda_h264.c @@ -25,7 +25,7 @@ #include #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 b7784393dfd..f638d201159 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 c34e323197f..34dc630efcc 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 76d2ab05d5c..541ebb2a040 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" -- 2.39.2