• Michael Niedermayer's avatar
    Merge commit 'e4155f15' · badb8e15
    Michael Niedermayer authored
    * commit 'e4155f15':
      eamad: use the AVFrame API properly.
      dpxenc: use the AVFrame API properly.
      bmpenc: use the AVFrame API properly.
      sgienc: use the AVFrame API properly.
    
    Conflicts:
    	libavcodec/bmpenc.c
    	libavcodec/dpxenc.c
    	libavcodec/eamad.c
    	libavcodec/sgienc.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    (cherry picked from commit 9ad477d9)
    
    Conflicts:
    
    	libavcodec/eamad.c
    
    Author of the merged code: Anton Khirnov
    badb8e15
bmpenc.c 7.06 KB