[FFmpeg-cvslog] Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun May 18 13:36:32 2014 +0200| [56d3cd1455ea1970165a3ca047a97c3e43a9e9aa] | committer: Michael Niedermayer

Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'

* commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37':
  yuv4mpeg: split the demuxer and muxer into separate files

Conflicts:
	libavformat/yuv4mpegdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=56d3cd1455ea1970165a3ca047a97c3e43a9e9aa
---