diff options
| author | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2023-02-13 17:02:01 -0500 |
|---|---|---|
| committer | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2023-02-14 09:01:04 -0500 |
| commit | 233de05a98d7090092bbbc60d0c151acb22c6aa0 (patch) | |
| tree | 4d1b34502f3bbe4a05cffde48c29edaa99dd08de /subprojects/gst-libav | |
| parent | cfb14c4b5df33153b68c9c10e6586ee8c07772b4 (diff) | |
| download | gstreamer-233de05a98d7090092bbbc60d0c151acb22c6aa0.tar.gz | |
avviddec: change AV_CODEC_CAP_AUTO_THREADS->AV_CODEC_CAP_OTHER_THREADS
This fixes a compile error with recent upstream FFmpeg.
The AV_CODEC_CAP_AUTO_THREADS was deprecated and renamed to
AV_CODEC_CAP_OTHER_THREADS in FFmpeg upstream commit
7d09579190de (lavc 58.132.100).
The AV_CODEC_CAP_AUTO_THREADS was finally removed in FFmpeg upstream
commit 10c9a0874cb3 (lavc 59.63.100).
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3951>
Diffstat (limited to 'subprojects/gst-libav')
| -rw-r--r-- | subprojects/gst-libav/ext/libav/gstavviddec.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/subprojects/gst-libav/ext/libav/gstavviddec.c b/subprojects/gst-libav/ext/libav/gstavviddec.c index 85e34a0c35..c215ff02f5 100644 --- a/subprojects/gst-libav/ext/libav/gstavviddec.c +++ b/subprojects/gst-libav/ext/libav/gstavviddec.c @@ -35,6 +35,10 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_PERFORMANCE); +#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58,132,100) +#define AV_CODEC_CAP_OTHER_THREADS AV_CODEC_CAP_AUTO_THREADS +#endif + #define GST_FFMPEG_VIDEO_CODEC_FRAME_FLAG_ALLOCATED (1<<15) #define MAX_TS_MASK 0xff @@ -615,7 +619,7 @@ gst_ffmpegviddec_set_format (GstVideoDecoder * decoder, if (ffmpegdec->max_threads == 0) { /* When thread type is FF_THREAD_FRAME, extra latency is introduced equal * to one frame per thread. We thus need to calculate the thread count ourselves */ - if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_AUTO_THREADS)) || + if ((!(oclass->in_plugin->capabilities & AV_CODEC_CAP_OTHER_THREADS)) || (ffmpegdec->context->thread_type & FF_THREAD_FRAME)) ffmpegdec->context->thread_count = MIN (gst_ffmpeg_auto_max_threads (), 16); |