[FFmpeg-cvslog] Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug 10 02:09:13 2014 +0200| [a71fcfad892c4c59a011556f70b998aca1139b37] | committer: Michael Niedermayer

Merge commit '9325d88eba8038b3e2a4485e473a018410379e2d'

* commit '9325d88eba8038b3e2a4485e473a018410379e2d':
  lavc: remove obsolete and disabled avpriv functions

Conflicts:
	libavcodec/dv_profile.c
	libavcodec/dv_profile.h

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

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