RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

h264_parser: Fix POC parsing for the case where MMCO_RESET is absent. 

The prev_ values were not set after parsing POC.
Increase length of the buffer decoded to parse enough safely.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Yusuke Nakamura 2013-09-16 18:34:27 +09:00 committed by Anton Khirnov
parent 6b081eff4d
commit b81dbd6cb7
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/h264_parser.c
View File

@ -132,8 +132,8 @@ static inline int parse_nal_units(AVCodecParserContext *s,
case NAL_SLICE: case NAL_SLICE:
case NAL_IDR_SLICE: case NAL_IDR_SLICE:
// Do not walk the whole buffer just to decode slice header // Do not walk the whole buffer just to decode slice header
if (src_length > 20) if (src_length > 60)
src_length = 20; src_length = 60;
break; break;
} }
ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length); ptr = ff_h264_decode_nal(h, buf, &dst_length, &consumed, src_length);
@ -219,8 +219,18 @@ static inline int parse_nal_units(AVCodecParserContext *s,
h->delta_poc[1] = get_se_golomb(&h->gb); h->delta_poc[1] = get_se_golomb(&h->gb);
} }
/* Decode POC of this picture. */
field_poc[0] = field_poc[1] = INT_MAX;
ff_init_poc(h, field_poc, &s->output_picture_number); ff_init_poc(h, field_poc, &s->output_picture_number);
/* Set up the prev_ values for decoding POC of the next picture. */
h->prev_frame_num = h->frame_num;
h->prev_frame_num_offset = h->frame_num_offset;
if (h->nal_ref_idc != 0) {
h->prev_poc_msb = h->poc_msb;
h->prev_poc_lsb = h->poc_lsb;
}
if (h->sps.pic_struct_present_flag) { if (h->sps.pic_struct_present_flag) {
switch (h->sei_pic_struct) { switch (h->sei_pic_struct) {
case SEI_PIC_STRUCT_TOP_FIELD: case SEI_PIC_STRUCT_TOP_FIELD: