diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-26 01:04:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-26 01:06:15 +0200 |
| commit | 8b2c3d2ae9515860f0be15d3ec8905a303140f97 (patch) | |
| tree | d1c2e4101981cfb9ac814ff259ea745be984c381 | |
| parent | 7228bdeebd2835172b4c3697e1e681399531f3e6 (diff) | |
| parent | cdf6eb5a9710566be217a3f17d3d94ac4e4d2662 (diff) | |
| download | ffmpeg-8b2c3d2ae9515860f0be15d3ec8905a303140f97.tar.gz | |
Merge commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662'
* commit 'cdf6eb5a9710566be217a3f17d3d94ac4e4d2662':
vc1: Do not return an error when skipping b frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 132ae76523..978327ce40 100644 --- 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) || |