[FFmpeg-cvslog] Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'
Michael Niedermayer
git at videolan.org
Mon Sep 23 14:34:50 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 14:27:09 2013 +0200| [eeeb3c8fa3a17c6d3363e68d8219cb8c07397f3b] | committer: Michael Niedermayer
Merge commit 'f7e616959aff8706edccdae763c24c897c449f6f'
* commit 'f7e616959aff8706edccdae763c24c897c449f6f':
electronicarts: Check packet sizes before reading
Conflicts:
libavformat/electronicarts.c
See: fb1ea777b3a01be6d71a103529ad37982707cacc
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eeeb3c8fa3a17c6d3363e68d8219cb8c07397f3b
---
More information about the ffmpeg-cvslog
mailing list