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)
* 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>

Trivial merge