diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 03:42:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 03:42:06 +0100 |
| commit | 51290068fa12995f68cff0ee309064f4cf6e788d (patch) | |
| tree | a90a1167763c86e0c2451b38468c491da50be025 /Makefile | |
| parent | d84f1a60e07cf78c4b4092ce00e6e6a2c751ea7a (diff) | |
| parent | e95018b694c0774477abec5bbf86ecc7946a9a28 (diff) | |
| download | ffmpeg-51290068fa12995f68cff0ee309064f4cf6e788d.tar.gz | |
Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'
* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
dnxhd: Support DNx444
Conflicts:
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions