Merge commit 'bb7bf17595'
* commit 'bb7bf17595':
vc1dec: Don't decode slices when the latest slice header failed to decode
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
c74fa39b93
1 changed files with 0 additions and 1 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue