Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 11:36:32 +0000 (13:36 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 11:37:25 +0000 (13:37 +0200)
commit56d3cd1455ea1970165a3ca047a97c3e43a9e9aa
treee0f59d1505d58a5d007cfb93f78257a0525d84d1
parent47a721348a5feae818127b821b6cfc47074938d7
parente4dc1000d7bbbcb5b45cf9849fc5315f19578e37
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>
libavformat/Makefile
libavformat/yuv4mpeg.h
libavformat/yuv4mpegdec.c
libavformat/yuv4mpegenc.c