Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/gejengel/files: gejengel-0.1.4-ffmpeg2.patch
Date: Fri, 06 Feb 2015 13:46:32
Message-Id: 20150206134629.757C2112E9@oystercatcher.gentoo.org
1 aballier 15/02/06 13:46:29
2
3 Added: gejengel-0.1.4-ffmpeg2.patch
4 Log:
5 add patch to build with ffmpeg2, bug #536626
6
7 Signed-off-by: aballier@g.o
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
9
10 Revision Changes Path
11 1.1 media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg2.patch?rev=1.1&content-type=text/plain
15
16 Index: gejengel-0.1.4-ffmpeg2.patch
17 ===================================================================
18 Index: gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
19 ===================================================================
20 --- gejengel-0.1.4.orig/src/AudioDecoder/ffmpegdecoder.cpp
21 +++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
22 @@ -28,6 +28,10 @@ extern "C"
23 #include <libavcodec/avcodec.h>
24 }
25
26 +#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
27 +#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
28 +#endif
29 +
30 using namespace std;
31 using namespace utils;
32
33 @@ -71,7 +75,7 @@ void FFmpegDecoder::destroy()
34
35 if (m_pFormatContext)
36 {
37 - av_close_input_file(m_pFormatContext);
38 + avformat_close_input(&m_pFormatContext);
39 m_pFormatContext = NULL;
40 }