• Michael Niedermayer's avatar
    Merge commit '848e86f7' · d9b264bc
    Michael Niedermayer authored
    * commit '848e86f7':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    d9b264bc
mpeg4videoenc.c 50.2 KB