Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'

* commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd': vc1dec: Don't decode slices when the latest slice header failed to decode Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · c74fa39b93
parent 79fbd7a5c1 bb7bf17595
commit c74fa39b93
1 changed files with 0 additions and 1 deletions
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@ -6072,7 +6072,6 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
    } else {
        int header_ret = 0;

-
        ff_mpeg_er_frame_start(s);

        v->bits = buf_size * 8;