Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)
commit92cbd775687204f9750a09c69f97702719036aab
tree16a375879e56045652edd2dd8f604bb7fb2fb4d0
parent9ad477d9098b5281cede0bd8525ca90b0e52436d
parentd48c20630214a4effcc920e93a5044bee4e2002e
Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'

* commit 'd48c20630214a4effcc920e93a5044bee4e2002e':
  qtrleenc: use the AVFrame API properly.
  ulti: use the AVFrame API properly.
  vc1: use the AVFrame API properly.
  flashsv: use the AVFrame API properly.

Conflicts:
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1.h
libavcodec/vc1dec.c