* commit 'cec5ce49':
  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@gmx.at>
(cherry picked from commit 21c41e76)

Conflicts:

	libavcodec/avs.c
Author of the merged code: Anton Khirnov