Changeset 831e749b in ffmpeg

Timestamp:

Jun 28, 2013, 8:08:43 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

16310e36

Parents:

1bcfb1e (diff), 07c52e2c (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 remote-tracking branch 'qatar/master'

• qatar/master: aac: return meaningful errors

Conflicts:

libavcodec/aacdec.c

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

(No files)