[FFmpeg-cvslog] Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
Michael Niedermayer
git at videolan.org
Mon Sep 23 13:28:36 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 23 13:20:42 2013 +0200| [621845feccd15cb035d55089aa16e07514fab89e] | committer: Michael Niedermayer
Merge commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8'
* commit '91be1103fd1f79d381edf268c32f4166b6c3b6d8':
wnv1: Make sure the input packet is large enough
Conflicts:
libavcodec/wnv1.c
See: f23a2418fb0ccc56fdae4dbf83a5994cc917c475
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=621845feccd15cb035d55089aa16e07514fab89e
---
More information about the ffmpeg-cvslog
mailing list