[FFmpeg-cvslog] Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 03:17:00 2013 +0100| [9ad477d9098b5281cede0bd8525ca90b0e52436d] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ad477d9098b5281cede0bd8525ca90b0e52436d
---