ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun May 10
22:19:01 2015 +0200| [73b8155b31ec7ad1132ecf5c45ac82acadeb28e5] | committer:
Michael Niedermayer
Merge commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81'
* commit '4d0ee4962be7e07cdc038a78008ef2e4e47e5f81':
avi: Validate sample_size
Conflicts:
libavformat/avidec.c
See: ca234639ac49a0dc073ac1f10977979acdb94f97
See: c7369f3a4bd21ea64571c1b0c4fcbf39f8daf68c
Merged-by: Michael Niedermayer <michae...@gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=73b8155b31ec7ad1132ecf5c45ac82acadeb28e5
---
_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
