[FFmpeg-cvslog] Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Nov 17 00:21:16 2013 +0100| [21c41e76d7c1ddaadafc9da50e99db51358f3754] | committer: Michael Niedermayer

Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'

* commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
  cdxl: remove an unused variable
  c93: use the AVFrame API properly.
  bethsoftvid: use the AVFrame API properly.
  avs: use the AVFrame API properly.

Conflicts:
	libavcodec/bethsoftvideo.c

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

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