[FFmpeg-soc] [soc]: r4690 - in concat: libavformat/Makefile.diff upstreamrev

[gkovacs]

Author: gkovacs
Date: Mon Jul 13 00:38:58 2009
New Revision: 4690

Log:
synced with upstream

Modified:
   concat/libavformat/Makefile.diff
   concat/upstreamrev

Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff	Mon Jul 13 00:30:28 2009	(r4689)
+++ concat/libavformat/Makefile.diff	Mon Jul 13 00:38:58 2009	(r4690)
@@ -1,8 +1,8 @@
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 8e8a869..7456eac 100644
+index f95b426..002b5d4 100644
 --- a/libavformat/Makefile
 +++ b/libavformat/Makefile
-@@ -34,6 +34,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
+@@ -33,6 +33,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
  OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
  OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
  OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.o

Modified: concat/upstreamrev
==============================================================================
--- concat/upstreamrev	Mon Jul 13 00:30:28 2009	(r4689)
+++ concat/upstreamrev	Mon Jul 13 00:38:58 2009	(r4690)
@@ -1,12 +1,12 @@
 ffmpeg:
-svn: 19400
-git: 4870db73039eb89db1aacce8cf60359be2d2fdf8
-committer: mru
-commitdate: Sun, 12 Jul 2009 00:17:42 +0000
-commitlog: configure: allow bulk-disabled things to be re-enabled by dependents
+svn: 19419
+git: faa53067a35c09644d3915edbbc85bc0f6675e30
+committer: diego
+commitdate: Sun, 12 Jul 2009 22:31:05 +0000
+commitlog: Make (de)muxers for format variants select the main format (de)muxer. It makes little sense to enable the variant without the main format.
 
 libswscale:
-svn: 19400
+svn: 19419
 git: f3ae90a5d9f9e01b326c031803b977be3d5369c0
 committer: ramiro
 commitdate: Thu, 9 Jul 2009 02:27:39 +0000