diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-12 14:56:40 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-20 07:56:17 +0200 |
| commit | 4209216ee80bd3e6b617dea142f65e47ca85aadc (patch) | |
| tree | ef1edf933400fe89fecf98aae344ee96524fed75 /libavcodec/mpeg4videodec.h | |
| parent | ac8afdb9b5228e79ab5582f932434b0dc0bbd186 (diff) | |
| download | ffmpeg-4209216ee80bd3e6b617dea142f65e47ca85aadc.tar.gz | |
avcodec/mpegvideodsp: Make MpegVideoDSP MPEG-4 only
It is only used by gmc/gmc1 which is only used by the MPEG-4
decoder, so move it to Mpeg4DecContext and rename it
to Mpeg4VideoDSP. Also compile it iff the MPEG-4 decoder is compiled.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/mpeg4videodec.h')
| -rw-r--r-- | libavcodec/mpeg4videodec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/mpeg4videodec.h b/libavcodec/mpeg4videodec.h index 8d1e121b67..302c5c38da 100644 --- a/libavcodec/mpeg4videodec.h +++ b/libavcodec/mpeg4videodec.h @@ -27,6 +27,7 @@ #include "get_bits.h" #include "mpegvideo.h" +#include "mpeg4videodsp.h" typedef struct Mpeg4DecContext { @@ -76,6 +77,8 @@ typedef struct Mpeg4DecContext { int rgb; + Mpeg4VideoDSPContext mdsp; + int32_t block32[12][64]; // 0 = DCT, 1 = DPCM top to bottom scan, -1 = DPCM bottom to top scan int dpcm_direction; |