[FFmpeg-cvslog] Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'
Michael Niedermayer
git at videolan.org
Mon Sep 30 01:16:21 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 30 01:09:38 2013 +0200| [b6dfb829132d17d4a8188b06da3bc91dd951fb53] | committer: Michael Niedermayer
Merge commit '30db94dc399f6e4ef8905049d9b740556f0fce47'
* commit '30db94dc399f6e4ef8905049d9b740556f0fce47':
xan: Use bytestream2 to limit reading to within the buffer
Conflicts:
libavcodec/xan.c
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b6dfb829132d17d4a8188b06da3bc91dd951fb53
---
More information about the ffmpeg-cvslog
mailing list