diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 21:11:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-29 21:21:49 +0100 |
| commit | 56252a5e097946be03ba67664d5efc20703a17a1 (patch) | |
| tree | 0643e339b4208a2806dafa6601248afc01002144 /libavformat/4xm.c | |
| parent | 64e7cf12532ecca43535db7a10303b99538a41dc (diff) | |
| parent | 1a07df31128da3a0020b66502399989b91770d44 (diff) | |
| download | ffmpeg-56252a5e097946be03ba67664d5efc20703a17a1.tar.gz | |
Merge commit '1a07df31128da3a0020b66502399989b91770d44'
* commit '1a07df31128da3a0020b66502399989b91770d44':
DNxHD: Add support for id 1258 (DNx100 960x720@8)
Conflicts:
Changelog
libavcodec/dnxhddata.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/4xm.c')
0 files changed, 0 insertions, 0 deletions