generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

h264: Only apply error concealment if theres a frame

Browse Source 
Without any correctly decoded slices, there can be no frame.

Fixes out of array reads

Found-by: Rafaël Carré
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-01-20 15:03:13 +01:00
parent 28245fb466
commit 60af6c3138
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@@ -2360,7 +2360,7 @@ static int field_end(H264Context *h, int in_setup)
* past end by one (callers fault) and resync_mb_y != 0 * past end by one (callers fault) and resync_mb_y != 0
* causes problems for the first MB line, too. * causes problems for the first MB line, too.
*/ */
if (!FIELD_PICTURE) if (!FIELD_PICTURE && h->current_slice)
ff_er_frame_end(s); ff_er_frame_end(s);
ff_MPV_frame_end(s); ff_MPV_frame_end(s);