Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 19:54:25 +0000 (20:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 19:54:25 +0000 (20:54 +0100)
commit64e7cf12532ecca43535db7a10303b99538a41dc
tree44e8d30cd71c64e9b1fc7de042b87fa4b5b2f57a
parente5b7e2224f62e9cb6697e664b7d1245302cca9e7
parent598f7d046cbf306706623210c5baafa3b7cd1df3
Merge commit '598f7d046cbf306706623210c5baafa3b7cd1df3'

* commit '598f7d046cbf306706623210c5baafa3b7cd1df3':
  DNxHD: Simplify pixel format detection

Conflicts:
libavcodec/dnxhddec.c

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