Gentoo Archives: gentoo-commits

From: "Ian Whyman (thev00d00)" <thev00d00@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/transcode/files: transcode-1.1.7-libav-9.patch
Date: Mon, 27 May 2013 09:10:03
Message-Id: 20130527090958.8776F2171D@flycatcher.gentoo.org
1 thev00d00 13/05/27 09:09:58
2
3 Added: transcode-1.1.7-libav-9.patch
4 Log:
5 Add patch to make it build with newer libav/ffmpeg, thanks to Ji?� Moravec for the patch #443214
6
7 (Portage version: 2.2.0_alpha177/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.1 media-video/transcode/files/transcode-1.1.7-libav-9.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/transcode/files/transcode-1.1.7-libav-9.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/transcode/files/transcode-1.1.7-libav-9.patch?rev=1.1&content-type=text/plain
14
15 Index: transcode-1.1.7-libav-9.patch
16 ===================================================================
17 --- ./import/probe_ffmpeg.c.original 2013-04-22 20:04:51.058081388 +0200
18 +++ ./import/probe_ffmpeg.c 2013-04-22 20:05:25.744081897 +0200
19 @@ -109,7 +109,7 @@ void probe_ffmpeg(info_t *ipipe)
20 return;
21 }
22
23 - ret = av_find_stream_info(lavf_dmx_context);
24 + ret = avformat_find_stream_info(lavf_dmx_context, NULL);
25 if (ret < 0) {
26 tc_log_error(__FILE__, "unable to fetch informations from '%s'"
27 " (libavformat failure)",
28 --- ./import/decode_lavc.c.original 2013-04-22 20:06:17.260082652 +0200
29 +++ ./import/decode_lavc.c 2013-04-22 20:07:47.564083975 +0200
30 @@ -170,7 +170,7 @@ void decode_lavc(decode_t *decode)
31
32 // Set these to the expected values so that ffmpeg's decoder can
33 // properly detect interlaced input.
34 - lavc_dec_context = avcodec_alloc_context();
35 + lavc_dec_context = avcodec_alloc_context3(NULL);
36 if (lavc_dec_context == NULL) {
37 tc_log_error(__FILE__, "Could not allocate enough memory.");
38 goto decoder_error;
39 @@ -186,7 +186,7 @@ void decode_lavc(decode_t *decode)
40 lavc_dec_context->error_concealment = 3;
41 lavc_dec_context->workaround_bugs = FF_BUG_AUTODETECT;
42
43 - if (avcodec_open(lavc_dec_context, lavc_dec_codec) < 0) {
44 + if (avcodec_open2(lavc_dec_context, lavc_dec_codec, NULL) < 0) {
45 tc_log_error(__FILE__, "Could not initialize the '%s' codec.",
46 codec->name);
47 goto decoder_error;