diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-02 21:11:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-25 21:05:59 +0200 |
| commit | 1934bb75361e7859873c6bf94ee1ceb17981c550 (patch) | |
| tree | 179826a4e29d2c0fb3e78a5663e21dce74551919 | |
| parent | 39ed5442620a7a0fd2328b7d4aefc6ae152c5441 (diff) | |
| download | ffmpeg-1934bb75361e7859873c6bf94ee1ceb17981c550.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)
Conflicts:
libavcodec/h264.c
| -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 059d65bfb8..1e6326f881 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2783,7 +2783,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) + if (!FIELD_PICTURE && h->current_slice && !h->sps.new) ff_er_frame_end(s); ff_MPV_frame_end(s); |