[FFmpeg-cvslog] Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 12:17:05 2013 +0100| [5b0c70c2499e20529d517b712910d6f4f72e9485] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5b0c70c2499e20529d517b712910d6f4f72e9485
---