← Back to branch summary

~ubuntu-branches/debian/experimental/libav/experimental

« back to all changes in this revision

Viewing changes to libavcodec/hevc_mvs.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2014-02-17 22:07:03 UTC
  • mfrom: (1.1.25)
  • Revision ID: package-import@ubuntu.com-20140217220703-51bpzx0ln1d961vs
Tags: 6:10~beta1-2
http://bugs.debian.org/738599
* New Upstream release 10_beta1. This upstream git snapshot has too many
  changes to list here, cf. to the upstream Changelog:
  http://git.libav.org/?p=libav.git;a=blob;f=Changelog;hb=refs/tags/v10_beta1
  - works with H.264 that has different bit depth between chroma and luma,
    Closes: #738599
* Bump shlibs

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/hevc_mvs.c
568
568
    int ref_pic_elist      = refPicList[elist].list[TAB_MVF(x, y).ref_idx[elist]];
569
569
    int ref_pic_curr       = refPicList[ref_idx_curr].list[ref_idx];
570
570
 
571
 
    if (ref_pic_elist != ref_pic_curr)
572
 
        mv_scale(mv, mv, s->poc - ref_pic_elist, s->poc - ref_pic_curr);
 
571
    if (ref_pic_elist != ref_pic_curr) {
 
572
        int poc_diff = s->poc - ref_pic_elist;
 
573
        if (!poc_diff)
 
574
            poc_diff = 1;
 
575
        mv_scale(mv, mv, poc_diff, s->poc - ref_pic_curr);
 
576
    }
573
577
}
574
578
 
575
579
static int mv_mp_mode_mx(HEVCContext *s, int x, int y, int pred_flag_index,