Changeset dce10f81 in ffmpeg

Timestamp:

Dec 8, 2014, 12:39:43 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

ef79bbed

Parents:

9bbb4a98 (diff), 4f5906a1 (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 commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'

• commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2': latm: Do not give a score for a single instance

Conflicts:

libavformat/rawdec.c

No change, the buggy case was not part of FFmpeg

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

(No files)