Commit c74fa39b authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'bb7bf175'

* commit 'bb7bf175':
  vc1dec: Don't decode slices when the latest slice header failed to decode

Conflicts:
	libavcodec/vc1dec.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 79fbd7a5 bb7bf175
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment