Merge commit '1a07df31128da3a0020b66502399989b91770d44'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 20:11:27 +0000 (21:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 20:21:49 +0000 (21:21 +0100)
commit56252a5e097946be03ba67664d5efc20703a17a1
tree0643e339b4208a2806dafa6601248afc01002144
parent64e7cf12532ecca43535db7a10303b99538a41dc
parent1a07df31128da3a0020b66502399989b91770d44
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>
Changelog
libavcodec/dnxhddata.c
libavcodec/dnxhddec.c