Skip to content

F
ffmpeg
Commit 757d8586 authored by Janne Grunau's avatar Janne Grunau
Browse files
Options

vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

parent d767e2f9
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
libavcodec/mpeg12.c
View file @ 757d8586
...@@ -2240,7 +2240,8 @@ static int decode_chunks(AVCodecContext *avctx, ...@@ -2240,7 +2240,8 @@ static int decode_chunks(AVCodecContext *avctx,
s2->er.error_count += s2->thread_context[i]->er.error_count; s2->er.error_count += s2->thread_context[i]->er.error_count;
} }
if (CONFIG_MPEG_VDPAU_DECODER && avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU) if ((CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER)
&& avctx->codec->capabilities & CODEC_CAP_HWACCEL_VDPAU)
ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count); ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count);
ret = slice_end(avctx, picture); ret = slice_end(avctx, picture);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment