[FFmpeg-cvslog] Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e'

Michael Niedermayer git at videolan.org
Wed Sep 4 12:55:07 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep  4 12:20:53 2013 +0200| [9411e9cafb524baeef054b6afd4d3927d2556869] | committer: Michael Niedermayer

Merge commit 'd719981273bc779c7d1e879d88404fd867f93a0e'

* commit 'd719981273bc779c7d1e879d88404fd867f93a0e':
  4xm: Check that the read track value is non-negative

Conflicts:
	libavformat/4xm.c

See: 0838cfdc8a10185604db5cd9d6bffad71279a0e8
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list