From 1aaa739edaa560f37f13a00bc28555ca6a71b394 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sun, 31 Aug 2008 11:49:06 +0000 Subject: [PATCH] ffmpegrev: Adjust time of swscale checkout to ffmpeg revision being used. Original commit message from CVS: * ffmpegrev: Adjust time of swscale checkout to ffmpeg revision being used. * gst-libs/ext/Makefile.am: Fix make distcheck --- ChangeLog | 7 +++++++ ffmpegrev | 2 +- gst-libs/ext/Makefile.am | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3282185..da08156 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-08-31 Edward Hervey + + * ffmpegrev: + Adjust time of swscale checkout to ffmpeg revision being used. + * gst-libs/ext/Makefile.am: + Fix make distcheck + 2008-08-29 Edward Hervey * ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_finalize), diff --git a/ffmpegrev b/ffmpegrev index 223bb10..5e7aa8b 100644 --- a/ffmpegrev +++ b/ffmpegrev @@ -5,4 +5,4 @@ FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk # 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-07-23 00:07:21 +0200}'" +FFMPEG_EXTERNALS_UPDATE="cd $FFMPEG_CO_DIR/libswscale && svn up -r '{2008-08-28 00:07:21 +0200}'" diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am index cbc8400..5036878 100644 --- a/gst-libs/ext/Makefile.am +++ b/gst-libs/ext/Makefile.am @@ -11,7 +11,7 @@ SUBDIRS = DIST_SUBDIRS = ffmpeg TMP_DIST_DIR=ffmpeg-dist -DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg/ +DIST_DIR=$(TMP_DIST_DIR)/.ffmpeg EXTRA_DIST=Makefile.am all-local: @@ -40,7 +40,7 @@ dist-local: if [ `ls -d $(TMP_DIST_DIR)/$$d*/ | wc -w` != "" ]; \ then for id in `cd $(TMP_DIST_DIR)/$$d && ls -d */`; \ do mkdir $(DIST_DIR)/$$d$$id; \ - cp $(TMP_DIST_DIR)/$$d$$id/*.c $(TMP_DIST_DIR)/$$d$$id/*.h $(DIST_DIR)/$$d$$id; \ + cp $(TMP_DIST_DIR)/$$d$$id/*.c $(TMP_DIST_DIR)/$$d$$id/*.h $(TMP_DIST_DIR)/$$d$$id/*.asm $(DIST_DIR)/$$d$$id; \ done \ fi \ done -- 2.7.4