Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:21:16 +0000 (00:21 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 23:21:16 +0000 (00:21 +0100)
commit21c41e76d7c1ddaadafc9da50e99db51358f3754
tree09e9916cc011e93f07a6044ca6c8b05d116e02fc
parentcc4a6435638fa2a471fef048a3e68eaf7e6e306c
parentcec5ce49229d61e4eb1f331a6d0dff3aa24f6655
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>
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/c93.c