RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 09:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'bb7bf175951475235ee7d0504198c4a30cf5d5dd'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-09-23 14:03:53 +02:00
commit c74fa39b93
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/vc1dec.c
View File

@ -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;