Permalink
Browse files

Restore needed patches against libav v0.8.4

Many crashes should now be fixed. The now deprecated APIs need to be removed
so we can update again to v9 and past.

Still need to add back the old patch #3 (hardcoded CPU detection) for binary
size optimization.

git-svn-id: https://svn.perian.org/trunk@1523 621663c8-3916-0410-8f58-edc14a8543d5
  • Loading branch information...
astrange
astrange committed Nov 6, 2012
1 parent a20237f commit ab2d378d6c4134e7f5dfe449c9f5d3de9e821ca6

This file was deleted.

Oops, something went wrong.
@@ -1,17 +1,17 @@
From 400dd05b52729ab35449444393a690141d1d5cfb Mon Sep 17 00:00:00 2001
From f222e497b412718008021b01b7b0ad0069348b88 Mon Sep 17 00:00:00 2001
From: Alexander Strange <astrange@ithinksw.com>
Date: Tue, 13 Jul 2010 16:07:20 -0700
Subject: [PATCH 4/6] Double INTERNAL_BUFFER_SIZE to fix running out of
Subject: [PATCH 1/2] Double INTERNAL_BUFFER_SIZE to fix running out of
buffers when QT retains 32 of them
Fixes a crash in some mp4.
---
libavcodec/mpegvideo.h | 2 +-
libavcodec/utils.c | 2 +-
libavcodec/mpegvideo.h | 2 +-
libavcodec/utils.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 46ad5d8..7d68aa7 100644
index 06be735..5675265 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -57,7 +57,7 @@ enum OutputFormat {
@@ -24,10 +24,10 @@ index 46ad5d8..7d68aa7 100644
#define ME_MAP_SIZE 64
#define ME_MAP_SHIFT 3
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 04909cf..8da3fcb 100644
index f64bff8..166b6de 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -125,7 +125,7 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height){
@@ -137,7 +137,7 @@ void avcodec_set_dimensions(AVCodecContext *s, int width, int height){
s->height= -((-height)>>s->lowres);
}
@@ -37,5 +37,5 @@ index 04909cf..8da3fcb 100644
void avcodec_align_dimensions2(AVCodecContext *s, int *width, int *height,
int linesize_align[AV_NUM_DATA_POINTERS])
--
1.7.8
1.8.0

This file was deleted.

Oops, something went wrong.
@@ -1,14 +1,14 @@
From 05d311486ffbd12d3afa9af6d1b4eeff98deffaa Mon Sep 17 00:00:00 2001
From 7580892bd9cfe66ad4058eac564e4342ef408ea0 Mon Sep 17 00:00:00 2001
From: Alexander Strange <astrange@ithinksw.com>
Date: Sat, 6 Nov 2010 05:24:09 -0400
Subject: [PATCH 5/6] Workaround for AVI audio tracks importing 1152x too long
Subject: [PATCH 2/2] Workaround for AVI audio tracks importing 1152x too long
---
libavformat/avidec.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
libavformat/avidec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index ad35995..8ab97b0 100644
index af6ee8e..7f170e3 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -98,7 +98,7 @@ static int guess_ni_flag(AVFormatContext *s);
@@ -21,5 +21,5 @@ index ad35995..8ab97b0 100644
return (len + ast->dshow_block_align - 1)/ast->dshow_block_align;
}else
--
1.7.8
1.8.0

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
@@ -60,12 +60,8 @@ else
fi
cd ffmpeg
#patch -p1 < ../Patches/0001-Disable-some-parts-of-h264.c-Perian-never-uses.patch
#patch -p1 < ../Patches/0002-Remove-the-warning-Cannot-parallelize-deblocking-typ.patch
#patch -p1 < ../Patches/0003-Hardcode-results-of-runtime-cpu-detection-in-dsputil.patch
#patch -p1 < ../Patches/0004-Double-INTERNAL_BUFFER_SIZE-to-fix-running-out-of-bu.patch
#patch -p1 < ../Patches/0005-Workaround-for-AVI-audio-tracks-importing-1152x-too-.patch
#patch -p1 < ../Patches/0006-Workaround-hang-issue-in-configure.patch
patch -p1 < ../Patches/0001-Double-INTERNAL_BUFFER_SIZE-to-fix-running-out-of-bu.patch
patch -p1 < ../Patches/0002-Workaround-for-AVI-audio-tracks-importing-1152x-too-.patch
cd ..
touch ffmpeg/patched

0 comments on commit ab2d378

Please sign in to comment.