ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Jun 30
12:59:16 2015 +0200| [6d9dfb1267d0a5b23ed3e857526bbca74223313a] | committer:
Michael Niedermayer
Merge commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501'
* commit '1b4c468477f3b8d372da8ef4e5405539ad9c1501':
riff: Validate the wav header size before trying to parse it
Conflicts:
libavformat/riffdec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6d9dfb1267d0a5b23ed3e857526bbca74223313a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog