-
Michael Niedermayer authored
* commit 'e95018b6': dnxhd: Support DNx444 Conflicts: Changelog libavcodec/dnxhddata.c libavcodec/dnxhddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
51290068
* commit 'e95018b6': dnxhd: Support DNx444 Conflicts: Changelog libavcodec/dnxhddata.c libavcodec/dnxhddec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>