Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-cdr/backlite/files: backlite-1.0.3-ffmpeg2.patch
Date: Fri, 06 Feb 2015 10:15:24
Message-Id: 20150206101521.72DAD112C9@oystercatcher.gentoo.org
1 aballier 15/02/06 10:15:21
2
3 Added: backlite-1.0.3-ffmpeg2.patch
4 Log:
5 fix build with ffmpeg2, bug #515160. patch grabbed from k9copy ebuild
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 app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-cdr/backlite/files/backlite-1.0.3-ffmpeg2.patch?rev=1.1&content-type=text/plain
15
16 Index: backlite-1.0.3-ffmpeg2.patch
17 ===================================================================
18 https://bugs.gentoo.org/show_bug.cgi?id=515160
19
20 Index: backlite-1.0.3/src/import/k9avidecode.h
21 ===================================================================
22 --- backlite-1.0.3.orig/src/import/k9avidecode.h
23 +++ backlite-1.0.3/src/import/k9avidecode.h
24 @@ -40,7 +40,11 @@ typedef int (*avformat_find_stream_info_
25 #else
26 typedef int (*av_find_stream_info_t)(AVFormatContext *);
27 #endif
28 +#if LIBAVCODEC_VERSION_MAJOR < 55
29 typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID);
30 +#else
31 +typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID);
32 +#endif
33 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0)
34 typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **);
35 #else