vapier 15/02/17 02:54:28 Modified: transcode-1.1.7-ffmpeg2.patch Log: Handle renamed CODEC_ID defines #538500 by Patrick Lauer. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch?r1=1.1&r2=1.2 Index: transcode-1.1.7-ffmpeg2.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- transcode-1.1.7-ffmpeg2.patch 20 Jul 2013 15:58:52 -0000 1.1 +++ transcode-1.1.7-ffmpeg2.patch 17 Feb 2015 02:54:28 -0000 1.2 @@ -290,6 +290,25 @@ =================================================================== --- transcode-1.1.7.orig/export/aud_aux.c +++ transcode-1.1.7/export/aud_aux.c +@@ -326,10 +326,18 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) + + switch (o_codec) { + case 0x50: ++#if LIBAVCODEC_VERSION_MAJOR < 55 + codeid = CODEC_ID_MP2; ++#else ++ codeid = AV_CODEC_ID_MP2; ++#endif + break; + case 0x2000: ++#if LIBAVCODEC_VERSION_MAJOR < 55 + codeid = CODEC_ID_AC3; ++#else ++ codeid = AV_CODEC_ID_AC3; ++#endif + break; + default: + tc_warn("cannot init ffmpeg with %x", o_codec); @@ -346,7 +346,7 @@ static int tc_audio_init_ffmpeg(vob_t *v //-- set parameters (bitrate, channels and sample-rate) -- @@ -308,6 +327,20 @@ TC_UNLOCK_LIBAVCODEC; if (ret < 0) { tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", +@@ -371,7 +371,12 @@ static int tc_audio_init_ffmpeg(vob_t *vob, int o_codec) + TC_UNLOCK_LIBAVCODEC; + if (ret < 0) { + tc_warn("tc_audio_init_ffmpeg: could not open %s codec !", +- (codeid == CODEC_ID_MP2) ?"mpa" :"ac3"); ++#if LIBAVCODEC_VERSION_MAJOR < 55 ++ (codeid == CODEC_ID_MP2) ++#else ++ (codeid == AV_CODEC_ID_MP2) ++#endif ++ ?"mpa" :"ac3"); + return(TC_EXPORT_ERROR); + } + Index: transcode-1.1.7/import/import_ffmpeg.c =================================================================== --- transcode-1.1.7.orig/import/import_ffmpeg.c
