← Back to branch summary

~ubuntu-branches/debian/experimental/ffmpeg/experimental

« back to all changes in this revision

Viewing changes to libavcodec/hevcpred_template.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun, Andreas Cadhalpun, Carl Eugen Hoyos
  • Date: 2015-07-09 23:42:42 UTC
  • mfrom: (0.1.17) (3.1.27 sid)
  • Revision ID: package-import@ubuntu.com-20150709234242-mf3vk9qgvcv9zh3s
Tags: 7:2.7.1-2
[ Andreas Cadhalpun ]
* Build libavcodec-extra flavor.
* Add encdec-extra autopkgtest for the libavcodec-extra flavor.
* Add lib*-dev and libav-tools-links packages.
* Drop README.Debian.
* Remove bogus apng-ffm autopkg test.
* Explicitly build-depend on liblzma-dev used by the tiff decoder.
* Use the pkg-multimedia repository for the Vcs links.
* Use the plain lib*-dev packages for the test dependencies.
* Disable libssh on sparc due to #790067.
* Remove temporary gdb dependency on sparc64.
* Enable openal on sparc64.

[ Carl Eugen Hoyos ]
* Disable x265 on alpha due to #789807.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavcodec/hevcpred_template.c
117
117
    if (s->pps->constrained_intra_pred_flag == 1) {
118
118
        int size_in_luma_pu_v = PU(size_in_luma_v);
119
119
        int size_in_luma_pu_h = PU(size_in_luma_h);
120
 
        int on_pu_edge_x    = !(x0 & ((1 << s->sps->log2_min_pu_size) - 1));
121
 
        int on_pu_edge_y    = !(y0 & ((1 << s->sps->log2_min_pu_size) - 1));
 
120
        int on_pu_edge_x    = !av_mod_uintp2(x0, s->sps->log2_min_pu_size);
 
121
        int on_pu_edge_y    = !av_mod_uintp2(y0, s->sps->log2_min_pu_size);
122
122
        if (!size_in_luma_pu_h)
123
123
            size_in_luma_pu_h++;
124
124
        if (cand_bottom_left == 1 && on_pu_edge_x) {