[FFmpeg-cvslog] Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 11:41:26 2013 +0100| [85b7b0c519f8d9491b4c0340329a605cc97c8984] | committer: Michael Niedermayer

Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'

* commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
  lclenc: use the AVFrame API properly.

Conflicts:
	libavcodec/lclenc.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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