summaryrefslogtreecommitdiff
path: root/libavformat/yuv4mpeg.h
Commit message (Collapse)AuthorAge
* Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'Michael Niedermayer2014-05-18
| | | | | | | | | | * commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37': yuv4mpeg: split the demuxer and muxer into separate files Conflicts: libavformat/yuv4mpegdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* yuv4mpeg: split the demuxer and muxer into separate filesAnton Khirnov2014-05-18