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

Minor simplification of code in init_poc(). 

Originally committed as revision 14379 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-07-24 22:29:38 +00:00
parent 5710b37160
commit b78a6baaf1
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h264.c
View File

@ -3699,10 +3699,9 @@ static int init_poc(H264Context *h){
const int max_frame_num= 1<<h->sps.log2_max_frame_num;
int field_poc[2];
h->frame_num_offset= h->prev_frame_num_offset;
if(h->frame_num < h->prev_frame_num)
h->frame_num_offset= h->prev_frame_num_offset + max_frame_num;
else
h->frame_num_offset= h->prev_frame_num_offset;
h->frame_num_offset += max_frame_num;
if(h->sps.poc_type==0){
const int max_poc_lsb= 1<<h->sps.log2_max_poc_lsb;
@ -3753,10 +3752,10 @@ static int init_poc(H264Context *h){
if(s->picture_structure == PICT_FRAME)
field_poc[1] += h->delta_poc[1];
}else{
int poc;
int poc= 2*(h->frame_num_offset + h->frame_num);
if(h->nal_ref_idc) poc= 2*(h->frame_num_offset + h->frame_num);
else poc= 2*(h->frame_num_offset + h->frame_num) - 1;
if(!h->nal_ref_idc)
poc--;
field_poc[0]= poc;
field_poc[1]= poc;