[FFmpeg-cvslog] Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

Michael Niedermayer git at videolan.org
Sun May 4 00:42:06 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May  3 23:53:52 2014 +0200| [4210cbf1937375c1e92a13258333b1af4e1a4371] | committer: Michael Niedermayer

Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5'

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

Conflicts:
	libavformat/rawdec.c

See: 47818b2a675cbb2a2fe0066c0657f3169047dd4d
See: 097f668047c8dd6308217c244075b1f97d496116
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list