mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-29 23:32:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Bump upstream ffmpeg revision to todays (rev 13766). ffmpeg now requires libbz2.

Browse source 
Original commit message from CVS:
* ext/ffmpeg/Makefile.am:
* ffmpegrev:
Bump upstream ffmpeg revision to todays (rev 13766).
ffmpeg now requires libbz2.
This commit is contained in:
Edward Hervey 2008-06-13 15:23:08 +00:00
parent 4cd2785756
commit 63d2aa24cf
4 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-06-13 Edward Hervey <edward.hervey@collabora.co.uk>
* ext/ffmpeg/Makefile.am:
* ffmpegrev:
Bump upstream ffmpeg revision to todays (rev 13766).
ffmpeg now requires libbz2.
2008-05-26 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/ffmpeg/gstffmpegdemux.c: (gst_ffmpegdemux_register):

2
common

@ -1 +1 @@
Subproject commit 032f2d973bd5c9a9b457cb5fc72d13dafe85c01e
Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8

2
ext/ffmpeg/Makefile.am
View file

@ -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

4
ffmpegrev
View file

@ -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}'"