[FFmpeg-cvslog] Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a'
Michael Niedermayer
git at videolan.org
Sun Sep 29 22:58:05 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 29 22:51:02 2013 +0200| [3a3ebc7c7dcc650c917bd36cadff09f1016f964c] | committer: Michael Niedermayer
Merge commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a'
* commit '8d07258bb6063d0780ce2d39443d6dc6d8eedc5a':
avidec: Make sure a packet is large enough before reading its data
Conflicts:
libavformat/avidec.c
See: 028cc42a1638e6f93a857f11c2568d1c3a51e612
Note: data!=NULL implies that the allocated array is at least FF_INPUT_BUFFER_PADDING_SIZE large
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a3ebc7c7dcc650c917bd36cadff09f1016f964c
---
More information about the ffmpeg-cvslog
mailing list