← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ffmpeg/vivid-proposed

« back to all changes in this revision

Viewing changes to libswscale/utils.c

  • Committer: Package Import Robot
  • Author(s): Andreas Cadhalpun
  • Date: 2015-02-14 23:14:52 UTC
  • mfrom: (0.1.22)
  • Revision ID: package-import@ubuntu.com-20150214231452-od0roffwuk2030e1
Tags: 7:2.5.4-1
http://bugs.debian.org/776649
* Import new upstream bugfix release 2.5.4.
* Drop configure-enable-vsx-together-with-altivec-for-ppc64el.patch
  included upstream.
* Add patches making the build binary reproducible.
* Stop using faketime.
* Correctly handle noopt in DEB_BUILD_OPTIONS.
* Disable assembler optimizations on ppc64el, as they don't work yet.
* Disable assembler optimizations on mips64(el), as they don't work yet.
  Thanks to James Cowgill. (Closes: #776649)
* Fix dep5-copyright-license-name-not-unique lintian warnings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libswscale/utils.c
611
611
        }
612
612
 
613
613
        if ((*filterPos)[i] + filterSize > srcW) {
614
 
            int shift = (*filterPos)[i] + filterSize - srcW;
 
614
            int shift = (*filterPos)[i] + FFMIN(filterSize - srcW, 0);
 
615
 
615
616
            // move filter coefficients right to compensate for filterPos
616
617
            for (j = filterSize - 2; j >= 0; j--) {
617
618
                int right = FFMIN(j + shift, filterSize - 1);
618
619
                filter[i * filterSize + right] += filter[i * filterSize + j];
619
620
                filter[i * filterSize + j]      = 0;
620
621
            }
621
 
            (*filterPos)[i]= srcW - filterSize;
 
622
            (*filterPos)[i]-= shift;
622
623
        }
623
624
    }
624
625