From 63d2aa24cfb2a2199d5ca33b1a367ff25a45e14c Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 13 Jun 2008 15:23:08 +0000 Subject: [PATCH] Bump upstream ffmpeg revision to todays (rev 13766). ffmpeg now requires libbz2. Original commit message from CVS: * ext/ffmpeg/Makefile.am: * ffmpegrev: Bump upstream ffmpeg revision to todays (rev 13766). ffmpeg now requires libbz2. --- ChangeLog | 7 +++++++ common | 2 +- ext/ffmpeg/Makefile.am | 2 +- ffmpegrev | 4 ++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b8ff57..779fdeb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-13 Edward Hervey + + * ext/ffmpeg/Makefile.am: + * ffmpegrev: + Bump upstream ffmpeg revision to todays (rev 13766). + ffmpeg now requires libbz2. + 2008-05-26 Wim Taymans * ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register): diff --git a/common b/common index 032f2d9..46ec7df 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 032f2d973bd5c9a9b457cb5fc72d13dafe85c01e +Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8 diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am index cbf98d4..c76eeb8 100644 --- a/ext/ffmpeg/Makefile.am +++ b/ext/ffmpeg/Makefile.am @@ -15,7 +15,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \ libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \ $(FFMPEG_CFLAGS) -libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(LIBM) -lz +libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(LIBM) -lz -lbz2 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS) if HAVE_FFMPEG_UNINSTALLED diff --git a/ffmpegrev b/ffmpegrev index d416b09..528d20d 100644 --- a/ffmpegrev +++ b/ffmpegrev @@ -1,9 +1,9 @@ # 6315, 10844, 10876, 10910, 10932, 10939 -FFMPEG_REVISION=13080 +FFMPEG_REVISION=13766 FFMPEG_CO_DIR=gst-libs/ext/ffmpeg FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk # Because ffmpeg checks out libswscale via an svn:externals, checking # out an old ffmpeg does not check out a corresponding libswscale. # Keep the swscale checkout manually synchronized, then. Update this # when you update FFMPEG_REVISION. -FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-05-08 00:07:21 +0200}'" +FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-06-12 00:07:21 +0200}'" -- GitLab