summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg/A01-swscale-assert.patch
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2012-07-11 20:10:20 +0000
committerjstebbins <[email protected]>2012-07-11 20:10:20 +0000
commit8b91bcb733913afea795cfea6178372eee5b4abe (patch)
tree09b4bd5693f2c361861d803522d2340b6beab985 /contrib/ffmpeg/A01-swscale-assert.patch
parent7f1f338df87f6075e7edf0cd598523acaf0f82a1 (diff)
bump libav to libav-v0.8-2197-g1a068bf
Resolves several deprecated api's Eliminates several libav patches Eliminates our builtin downmix in favour of avresample Eliminate HB_INPUT_CH_LAYOUT_* and replace with AV_CH_LAYOUT_* Resolves 6.x and 7.0 input channel layout issues HB had Adds downmix support to declpcm. We never had it! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4825 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg/A01-swscale-assert.patch')
-rw-r--r--contrib/ffmpeg/A01-swscale-assert.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/contrib/ffmpeg/A01-swscale-assert.patch b/contrib/ffmpeg/A01-swscale-assert.patch
new file mode 100644
index 000000000..8136a35b2
--- /dev/null
+++ b/contrib/ffmpeg/A01-swscale-assert.patch
@@ -0,0 +1,15 @@
+diff --git a/libswscale/utils.c b/libswscale/utils.c
+index d8fee58..b96a771 100644
+--- a/libswscale/utils.c
++++ b/libswscale/utils.c
+@@ -508,7 +508,9 @@ static int initFilter(int16_t **outFilter, int32_t **filterPos,
+ // FIXME try to align filterPos if possible
+
+ // fix borders
+- if (is_horizontal) {
++ // This "horizontal" only check causes a subsequent assert when
++ // upscaling.
++ /*if (is_horizontal)*/ {
+ for (i = 0; i < dstW; i++) {
+ int j;
+ if ((*filterPos)[i] < 0) {