diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:11:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 11:18:23 +0100 |
| commit | b1064dd783b25b80ec0790876877bc886c2ec449 (patch) | |
| tree | 23481a59a22165e21b6926bc6d096b0a47b1cd50 /libavcodec/mpeg12.c | |
| parent | 7609d42d0f4682ccccbebe0c70613af189134a33 (diff) | |
| parent | 1db6a080bddd14fed6b29140ecd2e21e42b1c022 (diff) | |
| download | ffmpeg-streaming-b1064dd783b25b80ec0790876877bc886c2ec449.zip ffmpeg-streaming-b1064dd783b25b80ec0790876877bc886c2ec449.tar.gz | |
Merge commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022'
* commit '1db6a080bddd14fed6b29140ecd2e21e42b1c022':
dca: Move ff_dca_convert_bitstream() to the DCA common code
vdpau: wrap codec specific functions in appropiate #ifs
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 4047731..7a629c6 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2304,7 +2304,8 @@ static int decode_chunks(AVCodecContext *avctx, s2->er.error_count += s2->thread_context[i]->er.error_count; } - if (CONFIG_VDPAU && uses_vdpau(avctx)) + if ((CONFIG_MPEG_VDPAU_DECODER || CONFIG_MPEG1_VDPAU_DECODER) + && uses_vdpau(avctx)) ff_vdpau_mpeg_picture_complete(s2, buf, buf_size, s->slice_count); ret = slice_end(avctx, picture); |
