Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 21:53:52 +0000 (23:53 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 May 2014 22:19:35 +0000 (00:19 +0200)
commit4210cbf1937375c1e92a13258333b1af4e1a4371
tree259a3a8559566e17870cfb005a6742d5d601c54c
parentbc4b424dfa6e52e0deaf55452263d8113d8a3c52
parentf66d0c57b13c1b7102e1e353237af178960dd3c5
Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

* commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5':
  latm: Add a probe function

Conflicts:
libavformat/rawdec.c

See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/loasdec.c
libavformat/rawdec.c