Commit dce10f81 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '4f5906a1'

* commit '4f5906a1':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 9bbb4a98 4f5906a1
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment