diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 21:14:37 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-21 21:15:08 +0100 |
| commit | 9aa59a9ce6aaf52f58965f378e5144ccace85097 (patch) | |
| tree | 0f447e65ae882984651c63e0033e605b1e470a82 /libavcodec/sipr16kdata.h | |
| parent | f93bd82ee6bca14abf05f42024f02f03efebe054 (diff) | |
| parent | c416b5cdf117f080850d7674cb8b1984a2210924 (diff) | |
| download | ffmpeg-9aa59a9ce6aaf52f58965f378e5144ccace85097.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mxf: Add DNxHD UL
See: 2ff540a0fe02c2d2588a7d2aa7820e66a615de95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sipr16kdata.h')
0 files changed, 0 insertions, 0 deletions