Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:40:06 +0000 (09:40 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 27 Aug 2015 07:40:06 +0000 (09:40 +0200)
commit427598a2f423eb3374ab4c33777c77de2290a324
treec261e4355fdedafb8c69e046d9186e771f77f77e
parentf30132f9c4061081a4e7bd6df5cacb179b137b68
parentd68705c9756e6558c8e28d90b4c364f25ba72083
Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'

* commit 'd68705c9756e6558c8e28d90b4c364f25ba72083':
  dnxhddata: Add tables for missing DNx100 profiles

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Changelog
libavcodec/dnxhddata.c