Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 16:29:38 +0000 (18:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Aug 2014 16:29:38 +0000 (18:29 +0200)
commitb7f8d3de2c41de98185c304b4e5b35018a96e451
tree5762cb5d8734de9ea18eb590a07704bc76f9b0bd
parent6cdf409884bd2eef95bb478dfb04c1149dade155
parent7835c24e19d9e1cb43fba5a02ce9d81d518f1300
Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'

* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300':
  dv: Update DV-profile-related functions to current public API

Conflicts:
libavcodec/dvdec.c

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