diff options
author | Alessandro Ghedini <alessandro@ghedini.me> | 2014-04-21 19:10:52 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2014-04-25 18:22:25 +0200 |
commit | cdf6eb5a9710566be217a3f17d3d94ac4e4d2662 (patch) | |
tree | a5013a6d3daade129fc041d02261f45a61d398be /libavcodec | |
parent | 99e22b7859177f6d3ed6121040924b337dce5497 (diff) | |
download | ffmpeg-cdf6eb5a9710566be217a3f17d3d94ac4e4d2662.tar.gz |
vc1: Do not return an error when skipping b frames
This caused mpv (and possibly others) to fallback to software decoding after
seeking a VC1 stream.
Bug-Id: 667
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5d3ed807bb..98259242bd 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5941,7 +5941,7 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, /* skip B-frames if we don't have reference frames */ if (s->last_picture_ptr == NULL && (s->pict_type == AV_PICTURE_TYPE_B || s->droppable)) { - goto err; + goto end; } if ((avctx->skip_frame >= AVDISCARD_NONREF && s->pict_type == AV_PICTURE_TYPE_B) || (avctx->skip_frame >= AVDISCARD_NONKEY && s->pict_type != AV_PICTURE_TYPE_I) || |