Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:17:05 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 02:32:38 +0000 (03:32 +0100)
commit6133f450bb816db578c5253de9e072078fdf8edc
tree0c6e21083d480c76937e3e4ba4c0823d176c3670
parent8a9f4f8800c1cd35ec9e0d6b9a74db2834c94875
Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'

* commit '57e7b3a89f5a0879ad039e8f04273b48649799a8':
  dnxhdenc: use the AVFrame API properly.
  libx264: use the AVFrame API properly.
  svq1enc: use the AVFrame API properly.
  gif: use the AVFrame API properly.

Conflicts:
libavcodec/gif.c
libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5b0c70c2499e20529d517b712910d6f4f72e9485)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/dnxhdenc.c
libavcodec/dnxhdenc.h
libavcodec/gif.c
libavcodec/libx264.c
libavcodec/svq1enc.c