[FFmpeg-cvslog] Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 18:29:38 2014 +0200| [b7f8d3de2c41de98185c304b4e5b35018a96e451] | committer: Michael Niedermayer

Merge commit '7835c24e19d9e1cb43fba5a02ce9d81d518f1300'

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

Conflicts:
	libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b7f8d3de2c41de98185c304b4e5b35018a96e451
---