[FFmpeg-cvslog] Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 20:53:00 2014 +0200| [9400603140db5f44f35942482a3435e4b67e7e79] | committer: Michael Niedermayer

Merge commit '9f17685dfb70a73823aca16ad246ee3b831d1de8'

* commit '9f17685dfb70a73823aca16ad246ee3b831d1de8':
  avcodec: Deprecate unused defines and options

Conflicts:
	doc/APIchanges
	libavcodec/version.h

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

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