[FFmpeg-cvslog] Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'
Michael Niedermayer
git at videolan.org
Wed Sep 18 12:09:10 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Sep 18 11:24:27 2013 +0200| [46cc498b77bcb058823687fc98fa6beb290324c0] | committer: Michael Niedermayer
Merge commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68'
* commit 'd4c2a3740fb95f952a87ba320d2bf31f126bdf68':
xmv: Add more sanity checks for parameters read from the bitstream
Conflicts:
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=46cc498b77bcb058823687fc98fa6beb290324c0
---
More information about the ffmpeg-cvslog
mailing list