[FFmpeg-cvslog] Merge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 12:02:09 2013 +0100| [3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba] | committer: Michael Niedermayer

Merge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'

* commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7':
  sunrastenc: use the AVFrame API properly.
  targaenc: use the AVFrame API properly.
  tiffenc: use the AVFrame API properly.
  pngenc: use the AVFrame API properly.

Conflicts:
	libavcodec/pngenc.c
	libavcodec/sunrastenc.c
	libavcodec/targaenc.c
	libavcodec/tiffenc.c

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

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