Changeset d423fc12 in ffmpeg

Timestamp:

May 6, 2015, 6:23:54 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

251f9dcf

Parents:

958ddef4 (diff), d00f1e0f (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 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162'

• commit 'd00f1e0fc10bb945cdf140a6c320eb0c9cd25162': quickdraw: Convert to bytestream2

Conflicts:

libavcodec/qdrw.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)