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

Merge commit 'c39059bea3adebcd888571d1181db215eee54495' 

* commit 'c39059bea3adebcd888571d1181db215eee54495':
  h264: Fix direct temporal mvs for bottom-field-first poc order

Conflicts:
	libavcodec/h264_direct.c

See: ebd1c505d2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-21 02:14:25 +02:00
parent 08b597b1f8 c39059bea3
commit dc021a0218
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264_direct.c
View File

@ -49,9 +49,8 @@ static int get_scale_factor(H264Context *const h, int poc, int poc1, int i)
void ff_h264_direct_dist_scale_factor(H264Context *const h)
{
const int poc = h->picture_structure == PICT_FRAME ?
h->cur_pic_ptr->poc :
h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD];
const int poc = FIELD_PICTURE(h) ? h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD]
: h->cur_pic_ptr->poc;
const int poc1 = h->ref_list[1][0].poc;
int i, field;