[FFmpeg-cvslog] Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 22 20:12:51 2015 +0200| [d9b264bc73723ce538d72f28a4a8fb4f85af7eca] | committer: Michael Niedermayer

Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'

* commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42':
  mpegvideo: Drop flags and flags2

Conflicts:
	libavcodec/mpeg12dec.c
	libavcodec/mpeg12enc.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/mpegvideo_motion.c
	libavcodec/ratecontrol.c
	libavcodec/vc1_block.c
	libavcodec/vc1_loopfilter.c
	libavcodec/vc1_mc.c
	libavcodec/vc1dec.c

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

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