[FFmpeg-cvslog] vc1: Do not return an error when skipping b frames
Alessandro Ghedini
git at videolan.org
Wed Jul 23 10:51:13 CEST 2014
ffmpeg | branch: release/2.2 | Alessandro Ghedini <alessandro at ghedini.me> | Mon Apr 21 19:10:52 2014 +0200| [4ddac7199b247e4ed04296db944f29f5148e9860] | committer: Michael Niedermayer
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 at gentoo.org>
(cherry picked from commit cdf6eb5a9710566be217a3f17d3d94ac4e4d2662)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ddac7199b247e4ed04296db944f29f5148e9860
---
libavcodec/vc1dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 593e69f..4e1b8bf 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -6005,7 +6005,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) ||
More information about the ffmpeg-cvslog
mailing list