Changeset 8f20e3d4 in ffmpeg

Timestamp:

Mar 25, 2014, 6:39:00 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4090d5ba

Parents:

41e7e46c (diff), dc0c70e0 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (03/25/14 18:38:43)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/25/14 18:39:00)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: avcodec: add missing includes

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

(No files)