diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-02 21:11:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-05 16:53:12 +0100 |
| commit | eaa9d2cd6b8c1e2722d5bfc56ea67fde865200ce (patch) | |
| tree | 957a8f66fb8501741aab88de6a95d8d76b953a69 /libavcodec | |
| parent | d3bec2473972ac68aef7e7c9340631dfbf84ffa7 (diff) | |
| download | ffmpeg-eaa9d2cd6b8c1e2722d5bfc56ea67fde865200ce.tar.gz | |
h264: skip error concealment when SPS and slices are mismatching
Fixes out of array accesses
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 695af8eed642ff0104834495652d1ee784a4c14d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index da144db987..0aab4e7328 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2351,7 +2351,7 @@ static int field_end(H264Context *h, int in_setup) * past end by one (callers fault) and resync_mb_y != 0 * causes problems for the first MB line, too. */ - if (!FIELD_PICTURE && h->current_slice) + if (!FIELD_PICTURE && h->current_slice && !h->sps.new) ff_er_frame_end(s); ff_MPV_frame_end(s); |