aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-05-06 21:28:59 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-05-06 21:55:14 +0200
commit8b8fa09b654e5b5fc9beb59fc3ca348a31adf03d (patch)
tree8ffb0dd56c49412abaa948b1da418dc94800e3be
parent06d8fdb660fdb2ca18dffa3aa92e40d2a7909b95 (diff)
downloadffmpeg-8b8fa09b654e5b5fc9beb59fc3ca348a31adf03d.tar.gz
vc1dec: Call ff_vdpau_vc1_decode_picture() once for each field.
Fixes mplayer -vc ffvc1vdpau for interlaced streams.
-rw-r--r--libavcodec/vc1dec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 613241c62f..9e45cdfcbc 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -6008,7 +6008,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
if ((CONFIG_VC1_VDPAU_DECODER)
&&s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU)
+ if (v->field_mode && buf_start_second_field) {
+ ff_vdpau_vc1_decode_picture(s, buf_start, buf_start_second_field - buf_start);
+ ff_vdpau_vc1_decode_picture(s, buf_start_second_field, (buf + buf_size) - buf_start_second_field);
+ } else {
ff_vdpau_vc1_decode_picture(s, buf_start, (buf + buf_size) - buf_start);
+ }
else if (avctx->hwaccel) {
if (v->field_mode && buf_start_second_field) {
// decode first field