• Michael Niedermayer's avatar
    Merge commit '97168b20' · 4d373ee8
    Michael Niedermayer authored
    * commit '97168b20':
      eatgv: use the AVFrame API properly.
      libxavs: use the AVFrame API properly.
      nuv: use the AVFrame API properly.
      flashsvenc: use the AVFrame API properly.
    
    Conflicts:
    	libavcodec/eatgv.c
    	libavcodec/nuv.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    (cherry picked from commit a0c0629d)
    
    Conflicts:
    
    	libavcodec/eatgv.c
    Author of the merged code: Anton Khirnov
    4d373ee8
eatgv.c 11 KB