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

Merge commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a'

Browse Source 
* commit 'a8b19271c3b40ac3c3dc769fe248887acf14ba5a':
  avcodec: Add output_picture_number to AVCodecParserContext

Conflicts:
	doc/APIchanges
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-08-03 10:48:11 +02:00
parent 1607a98545 a8b19271c3
commit 82fdfe8e51
5 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264_parser.c
View File

@@ -288,7 +288,7 @@ static inline int parse_nal_units(AVCodecParserContext *s,
h->delta_poc[1] = get_se_golomb(&h->gb);
}
ff_init_poc(h, field_poc, NULL);
ff_init_poc(h, field_poc, &s->output_picture_number);
if (h->sps.pic_struct_present_flag) {
switch (h->sei_pic_struct) {