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

[Vitor Sessak]

gkovacs wrote:
> 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

Hmm, this is a funny way of merging with upstream...

-Vitor