summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Meier <maekke@gentoo.org>2008-10-16 05:27:40 +0000
committerMarkus Meier <maekke@gentoo.org>2008-10-16 05:27:40 +0000
commit0ba2cb2f5771786bd731244b3b34ec49721e40ef (patch)
treed1363148bc21d5f8f93ddffba0ada924d4383e10 /media-gfx/blender/files
parentadd media-gfx/blender-2.48-r2 to the media-video/ffmpeg-0.4.9_p20081014 mask (diff)
downloadgentoo-2-0ba2cb2f5771786bd731244b3b34ec49721e40ef.tar.gz
gentoo-2-0ba2cb2f5771786bd731244b3b34ec49721e40ef.tar.bz2
gentoo-2-0ba2cb2f5771786bd731244b3b34ec49721e40ef.zip
bump to 2.48 (bug #242202), with three revisions for different ffmpeg versions (-r2 is for media-video/ffmpeg-0.4.9_p20081014 with patch from bug #242058)
(Portage version: 2.2_rc12/cvs/Linux 2.6.27 i686)
Diffstat (limited to 'media-gfx/blender/files')
-rw-r--r--media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch b/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch
new file mode 100644
index 000000000000..93ae633d7501
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.48-ffmpeg-20081014.patch
@@ -0,0 +1,25 @@
+Index: blender-2.47/source/blender/src/hddaudio.c
+===================================================================
+--- blender-2.47.orig/source/blender/src/hddaudio.c
++++ blender-2.47/source/blender/src/hddaudio.c
+@@ -302,7 +302,8 @@ static void sound_hdaudio_extract_small_
+ audio_pkt_size = packet.size;
+
+ while (audio_pkt_size > 0) {
+- len = avcodec_decode_audio(
++ data_size= AVCODEC_MAX_AUDIO_FRAME_SIZE;
++ len = avcodec_decode_audio2(
+ hdaudio->pCodecCtx,
+ hdaudio->decode_cache
+ + decode_pos,
+@@ -469,7 +470,8 @@ static void sound_hdaudio_extract_small_
+ }
+
+ while (audio_pkt_size > 0) {
+- len = avcodec_decode_audio(
++ data_size = AVCODEC_MAX_AUDIO_FRAME_SIZE;
++ len = avcodec_decode_audio2(
+ hdaudio->pCodecCtx,
+ hdaudio->decode_cache
+ + decode_pos,
+