Commit 63d2aa24 authored by Edward Hervey's avatar Edward Hervey 🤘

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.
parent 4cd27857
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):
......
common @ 46ec7dfc
Subproject commit 032f2d973bd5c9a9b457cb5fc72d13dafe85c01e
Subproject commit 46ec7dfc1c09ff550ed6b7a4e0d3f2b2ac7d3ee8
......@@ -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
......
# 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}'"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment