Changeset 6c4e9ca in ffmpeg

Timestamp:

Aug 6, 2011, 10:32:19 PM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

640a905e

Parents:

4646ef87 (diff), b2700a5c (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> (08/06/11 22:32:11)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/06/11 22:32:19)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: lavc: fix misspelling in comment aac: propagate error return values for AV_LOG_ERROR-triggering events

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

(No files)