diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-02-17 02:54:28 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-17 02:54:28 +0000 |
| commit | 28b7f800f232accc7772101bb58d9d35f5626bc2 (patch) | |
| tree | 075cdb053c00950e9ca8f308994b3aba84a0f33c /media-video | |
| parent | Missing dep on gnome-common if doing eautoreconf (bug #540206, thanks to Tora... (diff) | |
| download | gentoo-2-28b7f800f232accc7772101bb58d9d35f5626bc2.tar.gz gentoo-2-28b7f800f232accc7772101bb58d9d35f5626bc2.tar.bz2 gentoo-2-28b7f800f232accc7772101bb58d9d35f5626bc2.zip | |
Handle renamed CODEC_ID defines #538500 by Patrick Lauer.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/transcode/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch | 33 |
2 files changed, 38 insertions, 1 deletions
diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog index 0c0652e95f6d..e27c2cca97ad 100644 --- a/media-video/transcode/ChangeLog +++ b/media-video/transcode/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/transcode # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.325 2015/02/17 01:19:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.326 2015/02/17 02:54:28 vapier Exp $ + + 17 Feb 2015; Mike Frysinger <vapier@gentoo.org> + files/transcode-1.1.7-ffmpeg2.patch: + Handle renamed CODEC_ID defines #538500 by Patrick Lauer. 17 Feb 2015; Mike Frysinger <vapier@gentoo.org> transcode-1.1.7-r1.ebuild, transcode-1.1.7-r2.ebuild, transcode-1.1.7-r3.ebuild: diff --git a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch index 26d7431402d8..956fc1e64e4d 100644 --- a/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch +++ b/media-video/transcode/files/transcode-1.1.7-ffmpeg2.patch @@ -290,6 +290,25 @@ Index: transcode-1.1.7/export/aud_aux.c =================================================================== --- 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 @@ Index: transcode-1.1.7/export/aud_aux.c 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 |