[FFmpeg-cvslog] Merge commit 'da35008c314eae5a10a8c070f5185b7694c0a37e' into release/2.4

[Michael Niedermayer]

ffmpeg | branch: release/2.4 | Michael Niedermayer <michaelni at gmx.at> | Sun Jan 18 00:24:03 2015 +0100| [1dc53463d9c9f50eb78f47aa8aff378cb0b5e7a3] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1dc53463d9c9f50eb78f47aa8aff378cb0b5e7a3
---