diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-24 18:56:49 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-01-26 15:30:54 +0100 |
| commit | 5fef87f1407398539a6474a20f6ea16132a33a23 (patch) | |
| tree | 3b17343ed0abe769ff3aa551c354438c2a1b2d9b | |
| parent | d0f0d613926550ebf293e1d32f7a395fa0a88aed (diff) | |
| download | ffmpeg-5fef87f1407398539a6474a20f6ea16132a33a23.tar.gz | |
avcodec/h264*: Remove unnecessary h264_mvpred.h inclusions
This is only needed by h264_cabac.c and h264_cavlc.c.
Also fix up the other headers while at it.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavcodec/h264_picture.c | 9 | ||||
| -rw-r--r-- | libavcodec/h264_slice.c | 3 | ||||
| -rw-r--r-- | libavcodec/h264dec.c | 9 |
3 files changed, 1 insertions, 20 deletions
diff --git a/libavcodec/h264_picture.c b/libavcodec/h264_picture.c index adf8a32378..dcd5874c2e 100644 --- a/libavcodec/h264_picture.c +++ b/libavcodec/h264_picture.c @@ -26,19 +26,10 @@ */ #include "libavutil/avassert.h" -#include "libavutil/imgutils.h" -#include "internal.h" -#include "cabac.h" -#include "cabac_functions.h" #include "error_resilience.h" #include "avcodec.h" #include "h264dec.h" -#include "h264data.h" -#include "h264chroma.h" -#include "h264_mvpred.h" -#include "mathops.h" #include "mpegutils.h" -#include "rectangle.h" #include "thread.h" void ff_h264_unref_picture(H264Context *h, H264Picture *pic) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 32df9fd3ae..dc636c5e78 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -27,8 +27,8 @@ #include "libavutil/avassert.h" #include "libavutil/display.h" -#include "libavutil/imgutils.h" #include "libavutil/film_grain_params.h" +#include "libavutil/pixdesc.h" #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" #include "internal.h" @@ -40,7 +40,6 @@ #include "h264dec.h" #include "h264data.h" #include "h264chroma.h" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "mathops.h" diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c index 3706ae0e31..ed9a74b0c6 100644 --- a/libavcodec/h264dec.c +++ b/libavcodec/h264dec.c @@ -28,29 +28,20 @@ #define UNCHECKED_BITSTREAM_READER 1 #include "libavutil/avassert.h" -#include "libavutil/display.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" -#include "libavutil/stereo3d.h" #include "libavutil/video_enc_params.h" #include "internal.h" -#include "bytestream.h" -#include "cabac.h" -#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" -#include "h264_mvpred.h" #include "h264_ps.h" #include "golomb.h" #include "hwconfig.h" -#include "mathops.h" -#include "me_cmp.h" #include "mpegutils.h" #include "profiles.h" #include "rectangle.h" |