Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:17:05 +0000 (12:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 11:19:55 +0000 (12:19 +0100)
commit5b0c70c2499e20529d517b712910d6f4f72e9485
tree620207093db182a6b54129a2a166b2f721685378
parent3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba
parent57e7b3a89f5a0879ad039e8f04273b48649799a8
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>
libavcodec/dnxhdenc.c
libavcodec/dnxhdenc.h
libavcodec/gif.c
libavcodec/libx264.c
libavcodec/svq1enc.c