[FFmpeg-soc] [soc]: r5216 - concat/Changelog.diff

[gkovacs]

Author: gkovacs
Date: Sun Aug 23 23:49:05 2009
New Revision: 5216

Log:
fix upstream merge error

Modified:
   concat/Changelog.diff

Modified: concat/Changelog.diff
==============================================================================
--- concat/Changelog.diff	Sun Aug 23 23:40:50 2009	(r5215)
+++ concat/Changelog.diff	Sun Aug 23 23:49:05 2009	(r5216)
@@ -1,18 +1,13 @@
 diff --git a/Changelog b/Changelog
-index 6ad6c4d..c9b1fcf 100644
+index 6ad6c4d..90abdb0 100644
 --- a/Changelog
 +++ b/Changelog
-@@ -32,8 +32,13 @@ version <next>:
- - RTMP support in libavformat
- - noX handling for OPT_BOOL X options
+@@ -34,6 +34,8 @@ version <next>:
  - 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
++- playlist API and concatenation support for ffmpeg
++- demuxers for M3U, PLS, and XSPF playlist formats