[FFmpeg-cvslog] Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'
Michael Niedermayer
git at videolan.org
Mon Sep 16 13:54:35 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 16 13:25:03 2013 +0200| [e0fcd0294e2f6cc9a3ade974a561be54c9efbc31] | committer: Michael Niedermayer
Merge commit 'ac9d159015a88aa2721b271875d18482f713f354'
* commit 'ac9d159015a88aa2721b271875d18482f713f354':
proresdec: Properly make sure an index doesn't run past the limit
Conflicts:
libavcodec/proresdec_lgpl.c
See: 30df9789a9745d8e4b1afc10d1a983bfc8816eb9
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e0fcd0294e2f6cc9a3ade974a561be54c9efbc31
---
More information about the ffmpeg-cvslog
mailing list