virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  hevc: Conceal zero td

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-10 03:54:21 +01:00
commit 03911c418f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/hevc_mvs.c
View File

@ -569,8 +569,12 @@ static av_always_inline void dist_scale(HEVCContext *s, Mv *mv,
int ref_pic_elist = refPicList[elist].list[TAB_MVF(x, y).ref_idx[elist]]; int ref_pic_elist = refPicList[elist].list[TAB_MVF(x, y).ref_idx[elist]];
int ref_pic_curr = refPicList[ref_idx_curr].list[ref_idx]; int ref_pic_curr = refPicList[ref_idx_curr].list[ref_idx];
if (ref_pic_elist != ref_pic_curr) if (ref_pic_elist != ref_pic_curr) {
mv_scale(mv, mv, s->poc - ref_pic_elist, s->poc - ref_pic_curr); int poc_diff = s->poc - ref_pic_elist;
if (!poc_diff)
poc_diff = 1;
mv_scale(mv, mv, poc_diff, s->poc - ref_pic_curr);
}
} }
static int mv_mp_mode_mx(HEVCContext *s, int x, int y, int pred_flag_index, static int mv_mp_mode_mx(HEVCContext *s, int x, int y, int pred_flag_index,