Changeset 2c0b246b in ffmpeg

Timestamp:

Dec 25, 2013, 11:39:23 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0d944ee3

Parents:

459db512 (diff), d06ca204 (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> (12/25/13 11:39:16)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/25/13 11:39:23)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: error.h: Do not circularly depend on avutil.h

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

(No files)