[FFmpeg-cvslog] Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 17 13:31:28 2014 +0100| [dc226c023d2b55d9e94b6b0b07b7c76ad6f0b16a] | committer: Michael Niedermayer

Merge commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2'

* commit '7245a0ae872d4f65396a37d13f5d1d2c2efe11c2':
  mpegvideo: remove h264-only fields

Conflicts:
	libavcodec/mpegvideo.h

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

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