[FFmpeg-cvslog] Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'
Michael Niedermayer
git at videolan.org
Thu Jun 13 14:02:53 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jun 13 13:56:14 2013 +0200| [67d5d97cdcd7ada748320edf34453d94668a67c6] | committer: Michael Niedermayer
Merge commit 'be373cb50d3c411366fec7eef2eb3681abe48f96'
* commit 'be373cb50d3c411366fec7eef2eb3681abe48f96':
4xm: do not overread the prestream buffer
Conflicts:
libavcodec/4xm.c
See: 9c661e95
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=67d5d97cdcd7ada748320edf34453d94668a67c6
---
More information about the ffmpeg-cvslog
mailing list