Merge commit '848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:12:51 +0000 (20:12 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 May 2015 18:24:41 +0000 (20:24 +0200)
commitd9b264bc73723ce538d72f28a4a8fb4f85af7eca
tree7a2f93dbd9adf87534c29c932ed157941a2c4af6
parent337aa17e61091500b95d6127c9ffd65d9086decb
parent848e86f74d3e6e87fa592ee8ba8c184cc5fd9a42
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@gmx.at>
24 files changed:
libavcodec/h261dec.c
libavcodec/h263.h
libavcodec/h263dec.c
libavcodec/ituh263enc.c
libavcodec/motion_est.c
libavcodec/mpeg12dec.c
libavcodec/mpeg12enc.c
libavcodec/mpeg4videodec.c
libavcodec/mpeg4videoenc.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_motion.c
libavcodec/mpegvideo_xvmc.c
libavcodec/ratecontrol.c
libavcodec/rv10.c
libavcodec/snowenc.c
libavcodec/svq1enc.c
libavcodec/vc1_block.c
libavcodec/vc1_loopfilter.c
libavcodec/vc1_mc.c
libavcodec/vc1dec.c
libavcodec/wmv2.c
libavcodec/x86/mpegvideo.c