[FFmpeg-soc] [soc]: r5215 - in concat: Changelog.diff libavformat/Makefile.diff libavformat/allformats.c.diff libavformat/utils.c.diff upstreamrev

[gkovacs]

Author: gkovacs
Date: Sun Aug 23 23:40:50 2009
New Revision: 5215

Log:
sync with upstream

Modified:
   concat/Changelog.diff
   concat/libavformat/Makefile.diff
   concat/libavformat/allformats.c.diff
   concat/libavformat/utils.c.diff
   concat/upstreamrev

Modified: concat/Changelog.diff
==============================================================================
--- concat/Changelog.diff	Sat Aug 22 07:43:33 2009	(r5214)
+++ concat/Changelog.diff	Sun Aug 23 23:40:50 2009	(r5215)
@@ -1,13 +1,18 @@
 diff --git a/Changelog b/Changelog
-index 1725e75..bde239b 100644
+index 6ad6c4d..c9b1fcf 100644
 --- a/Changelog
 +++ b/Changelog
-@@ -32,6 +32,8 @@ version <next>:
+@@ -32,8 +32,13 @@ version <next>:
  - RTMP support in libavformat
  - noX handling for OPT_BOOL X options
  - Wave64 demuxer
++<<<<<<< HEAD
 +- playlist API and concatenation support for ffmpeg
 +- demuxers for M3U, PLS, and XSPF playlist formats
++=======
+ - IEC-61937 compatible Muxer
+ - TwinVQ decoder
++>>>>>>> 6a3f0e960e6e07079743821db16a238754b5f7a3
  
  
  

Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff	Sat Aug 22 07:43:33 2009	(r5214)
+++ concat/libavformat/Makefile.diff	Sun Aug 23 23:40:50 2009	(r5215)
@@ -1,5 +1,5 @@
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 86dc03f..0a3afed 100644
+index 89b6ce2..7a3437f 100644
 --- a/libavformat/Makefile
 +++ b/libavformat/Makefile
 @@ -3,7 +3,7 @@ include $(SUBDIR)../config.mak
@@ -9,7 +9,7 @@ index 86dc03f..0a3afed 100644
 -HEADERS = avformat.h avio.h
 +HEADERS = avformat.h avio.h avplaylist.h
  
- OBJS = allformats.o cutils.o metadata.o metadata_compat.o options.o os_support.o sdp.o utils.o
+ OBJS = allformats.o cutils.o metadata.o metadata_compat.o options.o os_support.o sdp.o seek.o utils.o
  
 @@ -33,6 +33,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
  OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
@@ -35,7 +35,7 @@ index 86dc03f..0a3afed 100644
  OBJS-$(CONFIG_PVA_DEMUXER)               += pva.o
  OBJS-$(CONFIG_QCP_DEMUXER)               += qcp.o
  OBJS-$(CONFIG_R3D_DEMUXER)               += r3d.o
-@@ -224,6 +227,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
+@@ -225,6 +228,7 @@ OBJS-$(CONFIG_WSAUD_DEMUXER)             += westwood.o
  OBJS-$(CONFIG_WSVQA_DEMUXER)             += westwood.o
  OBJS-$(CONFIG_WV_DEMUXER)                += wv.o
  OBJS-$(CONFIG_XA_DEMUXER)                += xa.o

Modified: concat/libavformat/allformats.c.diff
==============================================================================
--- concat/libavformat/allformats.c.diff	Sat Aug 22 07:43:33 2009	(r5214)
+++ concat/libavformat/allformats.c.diff	Sun Aug 23 23:40:50 2009	(r5215)
@@ -1,5 +1,5 @@
 diff --git a/libavformat/allformats.c b/libavformat/allformats.c
-index 0990598..cbbe1cb 100644
+index d80d37a..7f7a853 100644
 --- a/libavformat/allformats.c
 +++ b/libavformat/allformats.c
 @@ -66,6 +66,7 @@ void av_register_all(void)
@@ -26,7 +26,7 @@ index 0990598..cbbe1cb 100644
      REGISTER_MUXER    (PSP, psp);
      REGISTER_DEMUXER  (PVA, pva);
      REGISTER_DEMUXER  (QCP, qcp);
-@@ -200,6 +203,7 @@ void av_register_all(void)
+@@ -201,6 +204,7 @@ void av_register_all(void)
      REGISTER_DEMUXER  (WSVQA, wsvqa);
      REGISTER_DEMUXER  (WV, wv);
      REGISTER_DEMUXER  (XA, xa);

Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff	Sat Aug 22 07:43:33 2009	(r5214)
+++ concat/libavformat/utils.c.diff	Sun Aug 23 23:40:50 2009	(r5215)
@@ -1,5 +1,5 @@
 diff --git a/libavformat/utils.c b/libavformat/utils.c
-index b9f6c00..74e2f71 100644
+index 4cec286..252e9d3 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
 @@ -27,6 +27,7 @@

Modified: concat/upstreamrev
==============================================================================
--- concat/upstreamrev	Sat Aug 22 07:43:33 2009	(r5214)
+++ concat/upstreamrev	Sun Aug 23 23:40:50 2009	(r5215)
@@ -1,13 +1,13 @@
 ffmpeg:
-svn: 19666
-git: 753d52cbd2428454b531965be08d924c761c4cc0
+svn: 19688
+git: 6a3f0e960e6e07079743821db16a238754b5f7a3
 committer: mru
-commitdate: Mon, 17 Aug 2009 02:23:53 +0000
-commitlog: AVR32: optimised mathops.h
+commitdate: Sun, 23 Aug 2009 15:39:42 +0000
+commitlog: Add myself as maintainer for AVR32 and MIPS
 
 libswscale:
-svn: 19666
-git: bb5f66040578ce22cca08e3605333a39ed048e0c
+svn: 19688
+git: 30c6a4d2f849809c0d1f9ca6d548f786990b1d38
 committer: ramiro
-commitdate: Mon, 17 Aug 2009 02:06:00 +0000
-commitlog: swscale-example: Make selection of dstW, dstH, and flags more clear.
+commitdate: Sun, 23 Aug 2009 20:31:38 +0000
+commitlog: swscale-example: Rename src->ref so as to not confuse with src being used in doTest().