Changeset 92cbd775 in ffmpeg

Timestamp:

Nov 17, 2013, 2:31:32 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

85b7b0c5

Parents:

9ad477d9 (diff), d48c2063 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

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>

(No files)