Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 23:17:49 +0000 (01:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 8 Jul 2015 23:17:49 +0000 (01:17 +0200)
commit4a2bcdb28b510ae1378b82acf422f8c8ff8a4635
treed4853a92b57fe47e3a618e8833fd7a309dac8e8a
parentedfcbf7c83cb7828c0531e788ba8c5c47b07fc5f
parent1761ab838c75223a6b97d8c0720d09275374c53d
Merge commit '1761ab838c75223a6b97d8c0720d09275374c53d'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/avcodec.h
libavcodec/mpegvideo.h
libavcodec/options_table.h
libavcodec/ratecontrol.c
libavcodec/version.h