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>
Tue, 7 Jan 2014 20:23:25 +0000 (21:23 +0100)
commit345e2a2b43885611f1d44d975235ba0db63b8de8
treec7caa8cadd71a98a5bb52a5c4a25c9020f33c35a
parent7442aa20fad1fc30c1b079b72d62cf26bee45acd
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>
(cherry picked from commit be1e6e7503b2f10b0176201418eb97912cee093f)

Conflicts:

libavcodec/ffv1enc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Author of the merged code: Anton Khirnov
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