Michael Niedermayer 4210cbf193 Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5' ...

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

Conflicts:
	libavformat/rawdec.c

See: 47818b2a67
See: 097f668047
Merged-by: Michael Niedermayer <michaelni@gmx.at>

2014-05-04 00:19:35 +02:00

2.7 KiB

Raw Blame History

View Raw