• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 59a53842
    Michael Niedermayer authored
    * qatar/master:
      mpegvideo: operate with pointers to AVFrames instead of whole structs
    
    Conflicts:
    	libavcodec/h261dec.c
    	libavcodec/h263dec.c
    	libavcodec/intrax8.c
    	libavcodec/mpeg12enc.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo.h
    	libavcodec/mpegvideo_enc.c
    	libavcodec/mpegvideo_motion.c
    	libavcodec/mpegvideo_xvmc.c
    	libavcodec/msmpeg4.c
    	libavcodec/ratecontrol.c
    	libavcodec/vaapi.c
    	libavcodec/vc1dec.c
    	libavcodec/vdpau_vc1.c
    
    See: fc567ac4Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    59a53842
mpeg4videoenc.c 50.1 KB