Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 12:27:46 +0000 (13:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 12:55:50 +0000 (13:55 +0100)
commitbe1e6e7503b2f10b0176201418eb97912cee093f
tree620da8277e8837ccbb93a2a21e14a9b188c95b16
parentf4f7888bab7061f08c54356c285adaba24383dc0
parent1c01b0253ebfe05f907c3a723101fe77f6dd2336
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: use the AVFrame API properly.
  ffv1: use the AVFrame API properly.
  jpegls: use the AVFrame API properly.
  huffyuv: use the AVFrame API properly.

Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c

Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1.c
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c
libavcodec/huffyuv.h
libavcodec/huffyuvdec.c
libavcodec/huffyuvenc.c
libavcodec/jpegls.h
libavcodec/jpeglsenc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c