• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · be1e6e75
    Michael Niedermayer authored
    * qatar/master:
      mpegvideo_enc: use the AVFrame API properly.
      ffv1: use the AVFrame API properly.
      jpegls: use the AVFrame API properly.
      huffyuv: use the AVFrame API properly.
    
    Conflicts:
    	libavcodec/ffv1.c
    	libavcodec/ffv1.h
    	libavcodec/ffv1dec.c
    	libavcodec/ffv1enc.c
    
    Changes to ffv1 are more redone than merged due to them being based on
    an ancient codebase and a good part of that having being done already
    as well.
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    be1e6e75
mpegvideo.h 42.2 KB