Michael Niedermayer 9ad477d909 Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462' ...

* commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462':
  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>

2013-11-17 03:17:48 +01:00

11 KiB

Raw Blame History

View Raw