[FFmpeg-cvslog] Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'

[Michael Niedermayer]

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

Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'

* commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3':
  vmnc: use the AVFrame API properly.
  xan: use the AVFrame API properly.
  xxan: use the AVFrame API properly.
  zerocodec: use the AVFrame API properly.

Conflicts:
	libavcodec/vmnc.c
	libavcodec/xan.c
	libavcodec/xxan.c

See: cf5ab8b6f71699a48a6384d5e5779630b4be7b56
See: ad438f450b83882a1277a79c1c3d6dfe55573b1c
See: 67607e20e882eb5639a4e9099caecb52a863ab68
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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