Michael Niedermayer 92cbd77568 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>

2013-11-17 03:31:32 +01:00

15 KiB

Raw Blame History

View Raw