diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:03:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 14:03:53 +0200 |
| commit | c74fa39b93eda712f4ec648d9099623cbe4095ee (patch) | |
| tree | 3ed6adde09e2bfbf65c9d855e5bae87c6803318b /libavcodec | |
| parent | 79fbd7a5c1d6308e5edb047a53f62be8484b9976 (diff) | |
| parent | bb7bf175951475235ee7d0504198c4a30cf5d5dd (diff) | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vc1dec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 800b1c787a..74b498030c 100644 --- 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; |