[FFmpeg-cvslog] Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 12:33:27 2013 +0100| [a0c0629dd963b00f989172f0c599353b6b288c37] | committer: Michael Niedermayer

Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'

* commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476':
  eatgv: use the AVFrame API properly.
  libxavs: use the AVFrame API properly.
  nuv: use the AVFrame API properly.
  flashsvenc: use the AVFrame API properly.

Conflicts:
	libavcodec/eatgv.c
	libavcodec/nuv.c

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

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