Changeset f63ee2aa in ffmpeg

Timestamp:

Nov 23, 2013, 1:53:39 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

6819eaf3

Parents:

3e641b4 (diff), 6f270da6 (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: libschroedingerenc: do not assert on values from external libraries

Conflicts:

libavcodec/libschroedingerenc.c

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

(No files)