Merge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'

* commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662': vc1: Do not return an error when skipping b frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
11 years ago · 8b2c3d2ae9
parent 7228bdeebd cdf6eb5a97
commit 8b2c3d2ae9
1 changed files with 1 additions and 1 deletions
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@ -5997,7 +5997,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) ||