diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-23 02:01:41 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-28 03:49:54 +0200 |
| commit | 6f7d3bde11b439da106e4226b7d115afded4086d (patch) | |
| tree | b80ff2a259077622b7f79512b64e45548273e5a5 /libavcodec/vp9block.c | |
| parent | 7ab9b30800c0847133fa23fc86d05029d0415fe2 (diff) | |
| download | ffmpeg-6f7d3bde11b439da106e4226b7d115afded4086d.tar.gz | |
avcodec/vp8, vp9: Avoid using VP56mv and VP56Frame in VP8/9
Instead replace VP56mv by new and identical structures VP8mv and VP9mv.
Also replace VP56Frame by VP8FrameType in vp8.h and use that
in VP8 code. Also remove VP56_FRAME_GOLDEN2, as this has only
been used by VP8, and use VP8_FRAME_ALTREF as replacement for
its usage in VP8 as this is more in line with VP8 verbiage.
This allows to remove all inclusions of vp56.h from everything
that is not VP5/6. This also removes implicit inclusions
of hpeldsp.h, h264chroma.h, vp3dsp.h and vp56dsp.h from all VP8/9
files.
(This also fixes a build issue: If one compiles with -O0 and disables
everything except the VP8-VAAPI encoder, the file containing
ff_vpx_norm_shift is not compiled, yet this is used implicitly
by vp56_rac_gets_nn() which is defined in vp56.h; it is unused
by the VP8-VAAPI encoder and declared as av_unused, yet with -O0
unused noninline functions are not optimized away, leading to
linking failures. With this patch, said function is not included
in vaapi_encode_vp8.c any more.)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/vp9block.c')
| -rw-r--r-- | libavcodec/vp9block.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c index baa343fddc..c6103ee6f0 100644 --- a/libavcodec/vp9block.c +++ b/libavcodec/vp9block.c @@ -24,7 +24,6 @@ #include "libavutil/avassert.h" #include "threadframe.h" -#include "vp56.h" #include "vp89_rac.h" #include "vp9.h" #include "vp9data.h" |