diff options
| author | Rodeo <[email protected]> | 2013-03-01 12:34:15 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-03-01 12:34:15 +0000 |
| commit | 9aa50a651315311e84b0272365fb63475df60de5 (patch) | |
| tree | ea03bbbced8637a96b3e6b6bb96e54a40b4361d3 | |
| parent | ec8cd2beec809b313c27735fe19ff9f44676a27e (diff) | |
Remove libswscale patch.
The assert it avoids is no longer triggered in the version of Libav we use.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5278 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | contrib/ffmpeg/A01-h264-recovery-point.patch (renamed from contrib/ffmpeg/A02-h264-recovery-point.patch) | 0 | ||||
| -rw-r--r-- | contrib/ffmpeg/A01-swscale-assert.patch | 15 | ||||
| -rw-r--r-- | contrib/ffmpeg/A02-dca-resync.patch (renamed from contrib/ffmpeg/A03-dca-resync.patch) | 0 | ||||
| -rw-r--r-- | contrib/ffmpeg/A03-truehd-downmix.patch (renamed from contrib/ffmpeg/A04-truehd-downmix.patch) | 0 |
4 files changed, 0 insertions, 15 deletions
diff --git a/contrib/ffmpeg/A02-h264-recovery-point.patch b/contrib/ffmpeg/A01-h264-recovery-point.patch index 8688c021c..8688c021c 100644 --- a/contrib/ffmpeg/A02-h264-recovery-point.patch +++ b/contrib/ffmpeg/A01-h264-recovery-point.patch diff --git a/contrib/ffmpeg/A01-swscale-assert.patch b/contrib/ffmpeg/A01-swscale-assert.patch deleted file mode 100644 index 9db84b7fa..000000000 --- a/contrib/ffmpeg/A01-swscale-assert.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/libswscale/utils.c b/libswscale/utils.c -index f0a2b46..61506c6 100644 ---- a/libswscale/utils.c -+++ b/libswscale/utils.c -@@ -531,7 +531,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) { diff --git a/contrib/ffmpeg/A03-dca-resync.patch b/contrib/ffmpeg/A02-dca-resync.patch index bbd9ad7ed..bbd9ad7ed 100644 --- a/contrib/ffmpeg/A03-dca-resync.patch +++ b/contrib/ffmpeg/A02-dca-resync.patch diff --git a/contrib/ffmpeg/A04-truehd-downmix.patch b/contrib/ffmpeg/A03-truehd-downmix.patch index 9a9c18e13..9a9c18e13 100644 --- a/contrib/ffmpeg/A04-truehd-downmix.patch +++ b/contrib/ffmpeg/A03-truehd-downmix.patch |