projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d767e2f
)
vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled
author
Janne Grunau
<janne-libav@jannau.net>
Tue, 26 Mar 2013 21:45:40 +0000
(22:45 +0100)
committer
Janne Grunau
<janne-libav@jannau.net>
Tue, 26 Mar 2013 21:53:29 +0000
(22:53 +0100)
libavcodec/mpeg12.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12.c
b/libavcodec/mpeg12.c
index
6008f9c
..
0634de1
100644
(file)
--- a/
libavcodec/mpeg12.c
+++ b/
libavcodec/mpeg12.c
@@
-2240,7
+2240,8
@@
static int decode_chunks(AVCodecContext *avctx,
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);
ret = slice_end(avctx, picture);