Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 7 Jan 2014 20:23:19 +0000 (21:23 +0100)
commit7442aa20fad1fc30c1b079b72d62cf26bee45acd
treeb9b2e7e1c9c601ca50ac2854b4c4dd57fa2819be
parent9918296a2df1c5a09211dabf13723a2d397489fe
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>
(cherry picked from commit 92cbd775687204f9750a09c69f97702719036aab)

Conflicts:

libavcodec/flashsv.c
Author of the merged code: Anton Khirnov
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1.h
libavcodec/vc1dec.c