Merge commit '4f5906a1d7f4368cec43b224e8a675f54d2001d2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 00:39:43 +0000 (01:39 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 8 Dec 2014 00:39:43 +0000 (01:39 +0100)
commitdce10f8178343d3c8b849f2470028e190a42a27c
tree9da5be2285c231ec6b3162fa8afb5336aa86440f
parent9bbb4a98fe53953f8e23d4f7ca1a0fdb7d0b5a77
parent4f5906a1d7f4368cec43b224e8a675f54d2001d2
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>