summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-11-10 12:18:56 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-11-10 12:18:56 +0000
commit2cf4cf063a03fa1dbe387881aecca73483170d44 (patch)
tree992d10a45fc8f426abd0f2379dd3f67ed311750a /media-sound/aqualung/files
parentAdd patch applied detection comment (diff)
downloadgentoo-2-2cf4cf063a03fa1dbe387881aecca73483170d44.tar.gz
gentoo-2-2cf4cf063a03fa1dbe387881aecca73483170d44.tar.bz2
gentoo-2-2cf4cf063a03fa1dbe387881aecca73483170d44.zip
fix build with ffmpeg/libav trunk, bug #379075
(Portage version: 2.2.0_alpha73/cvs/Linux x86_64)
Diffstat (limited to 'media-sound/aqualung/files')
-rw-r--r--media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch b/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch
new file mode 100644
index 000000000000..c8c3ad003be9
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-0.9_beta11-ffmpeg.patch
@@ -0,0 +1,22 @@
+Index: aqualung-0.9beta11/src/decoder/dec_lavc.c
+===================================================================
+--- aqualung-0.9beta11.orig/src/decoder/dec_lavc.c
++++ aqualung-0.9beta11/src/decoder/dec_lavc.c
+@@ -53,7 +53,7 @@ decode_lavc(decoder_t * dec) {
+
+ if (packet.stream_index == pd->audioStream) {
+
+- avcodec_decode_audio2(pd->avCodecCtx, samples, &n_bytes, packet.data, packet.size);
++ avcodec_decode_audio3(pd->avCodecCtx, samples, &n_bytes, &packet);
+ if (n_bytes > 0) {
+ int i;
+ for (i = 0; i < n_bytes/2; i++) {
+@@ -124,7 +124,7 @@ lavc_decoder_open(decoder_t * dec, char
+
+ pd->audioStream = -1;
+ for (i = 0; i < pd->avFormatCtx->nb_streams; i++) {
+- if (pd->avFormatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) {
++ if (pd->avFormatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+ pd->audioStream = i;
+ break;
+ }