Michael Niedermayer 21c41e76d7 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@gmx.at>

2013-11-17 00:21:16 +01:00

8.5 KiB

Raw Blame History

View Raw