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)
* commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300':
  dv: Update DV-profile-related functions to current public API

Conflicts:
libavcodec/dvdec.c

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

Simple merge