* commit '1a07df31':
  DNxHD: Add support for id 1258 (DNx100 960x720@8)

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