Merge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:24:03 +0000 (00:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 Jan 2015 23:24:03 +0000 (00:24 +0100)
commit1dc53463d9c9f50eb78f47aa8aff378cb0b5e7a3
treeed1f786c0ad1a0ef4db2325ce565a311c40082b9
parent705e0e05131fc64df76631947136571eafea8bfb
parentda35008c314eae5a10a8c070f5185b7694c0a37e
Merge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4

* commit 'da35008c314eae5a10a8c070f5185b7694c0a37e':
  latm: Do not give a score for a single instance

Conflicts:
libavformat/rawdec.c

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