[FFmpeg-cvslog] Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jul  9 01:17:49 2015 +0200| [4a2bcdb28b510ae1378b82acf422f8c8ff8a4635] | committer: Michael Niedermayer

Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'

* commit '1761ab838c75223a6b97d8c0720d09275374c53d':
  lavc: Deprecate avctx.rc_strategy

Conflicts:
	libavcodec/mpegvideo.h
	libavcodec/version.h

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

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