-
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: Michael Niedermayer <michaelni@gmx.at>
9ad477d9