Michael Niedermayer 56d3cd1455 Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37' ...

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

Conflicts:
	libavformat/yuv4mpegdec.c

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

2014-05-18 13:37:25 +02:00

951 B

Raw Blame History

View Raw