• Michael Niedermayer's avatar
    Merge commit 'd48c2063' · 7442aa20
    Michael Niedermayer authored
    * commit 'd48c2063':
      qtrleenc: use the AVFrame API properly.
      ulti: use the AVFrame API properly.
      vc1: use the AVFrame API properly.
      flashsv: use the AVFrame API properly.
    
    Conflicts:
    	libavcodec/flashsv.c
    	libavcodec/qtrleenc.c
    	libavcodec/ulti.c
    	libavcodec/vc1dec.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    (cherry picked from commit 92cbd775)
    
    Conflicts:
    
    	libavcodec/flashsv.c
    Author of the merged code: Anton Khirnov
    7442aa20
ulti.c 14.9 KB