[FFmpeg-cvslog] Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May  1 16:46:38 2014 +0200| [185164398763b76729d6169bea35d08c48d1d32f] | committer: Michael Niedermayer

Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

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

Conflicts:
	libavcodec/version.h

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

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