Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 02:17:00 +0000 (03:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 02:17:48 +0000 (03:17 +0100)
commit9ad477d9098b5281cede0bd8525ca90b0e52436d
tree64617e4d79e4bade2130f1b115cab54a61b45315
parent8d193a24f2da825aaf5382e4aa42ab533806b033
parente4155f15b35c4272a235f5521d2dc6c2aabdd462
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>
libavcodec/bmpenc.c
libavcodec/eamad.c
libavcodec/sgienc.c