Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 02:42:06 +0000 (03:42 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 10 Feb 2014 02:42:06 +0000 (03:42 +0100)
commit51290068fa12995f68cff0ee309064f4cf6e788d
treea90a1167763c86e0c2451b38468c491da50be025
parentd84f1a60e07cf78c4b4092ce00e6e6a2c751ea7a
parente95018b694c0774477abec5bbf86ecc7946a9a28
Merge commit 'e95018b694c0774477abec5bbf86ecc7946a9a28'

* commit 'e95018b694c0774477abec5bbf86ecc7946a9a28':
  dnxhd: Support DNx444

Conflicts:
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c