Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:46:38 +0000 (16:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 May 2014 14:46:38 +0000 (16:46 +0200)
commit185164398763b76729d6169bea35d08c48d1d32f
tree27d0d0368c03a9f26718ed2d49bfe5319413288e
parentcac07d0e103656a2436ea04b700128ce436a4d06
parentb2c31710c96fa47d9dcd40b64d39663e8957f683
Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

* commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683':
  lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Conflicts:
libavcodec/version.h

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