diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:04:51 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-06 22:04:51 +0100 |
commit | 1618f162a9daa1048c08eefe8086f78ea45e3647 (patch) | |
tree | ec1c56645973ed1f52f5bed42ba2b085e8be7a7c /libavformat/mxf.c | |
parent | 85d2b0987baeb980234c17be076108d53ffe0cd6 (diff) | |
parent | d48430c367947a64647c6959cf472f2c01778b17 (diff) | |
download | ffmpeg-1618f162a9daa1048c08eefe8086f78ea45e3647.tar.gz |
Merge commit 'd48430c367947a64647c6959cf472f2c01778b17'
* commit 'd48430c367947a64647c6959cf472f2c01778b17':
build: Let the SVQ3 decoder depend on the H.264 decoder
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.c')
0 files changed, 0 insertions, 0 deletions