Author: gkovacs Date: Thu Aug 13 22:54:51 2009 New Revision: 5097 Log: re-adding changelog entry
Modified: concat/Changelog.diff Modified: concat/Changelog.diff ============================================================================== --- concat/Changelog.diff Thu Aug 13 22:53:40 2009 (r5096) +++ concat/Changelog.diff Thu Aug 13 22:54:51 2009 (r5097) @@ -1,17 +1,13 @@ diff --git a/Changelog b/Changelog -index 1725e75..0eafc3b 100644 +index 1725e75..bde239b 100644 --- a/Changelog +++ b/Changelog -@@ -31,7 +31,12 @@ version <next>: - - RTP depacketization of ASF and RTSP from WMS servers +@@ -32,6 +32,8 @@ version <next>: - RTMP support in libavformat - noX handling for OPT_BOOL X options -+<<<<<<< HEAD + - Wave64 demuxer +- playlist API and concatenation support for ffmpeg +- demuxers for M3U, PLS, and XSPF playlist formats -+======= - - Wave64 demuxer -+>>>>>>> 184d37aca1e2eb2cd2438a77b7fb33a5cefee62b _______________________________________________ FFmpeg-soc mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
