* [gentoo-commits] gentoo-x86 commit in media-libs/xine-lib/files: xine-lib-1.2.2-libav.patch xine-lib-1.2.1-ffmpeg-git.patch
@ 2012-07-06 1:11 Luca Barbato (lu_zero)
0 siblings, 0 replies; only message in thread
From: Luca Barbato (lu_zero) @ 2012-07-06 1:11 UTC (permalink / raw
To: gentoo-commits
lu_zero 12/07/06 01:11:41
Modified: xine-lib-1.2.1-ffmpeg-git.patch
Added: xine-lib-1.2.2-libav.patch
Log:
Fix mistake in the version check for AVFrame.age
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
Revision Changes Path
1.2 media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch?r1=1.1&r2=1.2
Index: xine-lib-1.2.1-ffmpeg-git.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xine-lib-1.2.1-ffmpeg-git.patch 29 Feb 2012 01:12:55 -0000 1.1
+++ xine-lib-1.2.1-ffmpeg-git.patch 6 Jul 2012 01:11:41 -0000 1.2
@@ -68,7 +68,7 @@
#endif
+/* AVFrame.age */
-+#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1)
++#if !(LIBAVCODEC_VERSION_MAJOR > 53 || LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 28)
+# define AVFRAMEAGE 1
+#endif
1.1 media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch?rev=1.1&content-type=text/plain
Index: xine-lib-1.2.2-libav.patch
===================================================================
diff -r 2ebe9d14fb3c src/combined/ffmpeg/ffmpeg_compat.h
--- a/src/combined/ffmpeg/ffmpeg_compat.h Wed Jul 04 21:39:20 2012 +0300
+++ b/src/combined/ffmpeg/ffmpeg_compat.h Thu Jul 05 21:36:43 2012 +0200
@@ -101,7 +101,7 @@
#endif
/* AVFrame.age */
-#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1)
+#if !(LIBAVCODEC_VERSION_MAJOR > 53 || LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 28)
# define AVFRAMEAGE 1
#endif
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-07-06 1:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-06 1:11 [gentoo-commits] gentoo-x86 commit in media-libs/xine-lib/files: xine-lib-1.2.2-libav.patch xine-lib-1.2.1-ffmpeg-git.patch Luca Barbato (lu_zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox