har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264: fix direct temporal mvs for bottom-field-first poc order.

Browse Source 
Fixes http://forum.doom9.org/showthread.php?t=170867.
Fixes: corrupt-1677.mkv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ronald S. Bultje 2014-07-12 18:38:13 -04:00 committed by Michael Niedermayer
parent 1e3f77b53a
commit ebd1c505d2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264_direct.c
View File

@ -48,7 +48,9 @@ static int get_scale_factor(H264Context * const h, int poc, int poc1, int i){
} }
void ff_h264_direct_dist_scale_factor(H264Context * const h){ void ff_h264_direct_dist_scale_factor(H264Context * const h){
const int poc = h->cur_pic_ptr->field_poc[h->picture_structure == PICT_BOTTOM_FIELD]; 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 poc1 = h->ref_list[1][0].poc; const int poc1 = h->ref_list[1][0].poc;
int i, field; int i, field;