Merge commit 'd84429d41e24437536907af1e6b73197ecf3f6db'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:10:54 +0000 (22:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 May 2015 20:11:04 +0000 (22:11 +0200)
commit53d2b69b72b0bac919f3083298d3ad914ea86735
tree31a88e3de09a6aaa67c2a713882c8851c5019671
parente5397513b93d356ffec8e401e18cb8e8d89e2077
parentd84429d41e24437536907af1e6b73197ecf3f6db
Merge commit 'd84429d41e24437536907af1e6b73197ecf3f6db'

* commit 'd84429d41e24437536907af1e6b73197ecf3f6db':
  dnxhd: Print unknown header when found

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