diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 13:36:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 13:37:25 +0200 |
| commit | 56d3cd1455ea1970165a3ca047a97c3e43a9e9aa (patch) | |
| tree | e0f59d1505d58a5d007cfb93f78257a0525d84d1 /libavcodec/libopenjpegdec.c | |
| parent | 47a721348a5feae818127b821b6cfc47074938d7 (diff) | |
| parent | e4dc1000d7bbbcb5b45cf9849fc5315f19578e37 (diff) | |
| download | ffmpeg-56d3cd1455ea1970165a3ca047a97c3e43a9e9aa.tar.gz | |
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>
Diffstat (limited to 'libavcodec/libopenjpegdec.c')
0 files changed, 0 insertions, 0 deletions