ffmpeg | branch: release/2.2 | Michael Niedermayer <[email protected]> | Wed May
6 16:44:34 2015 +0200| [b34afd94ec908c051e1d76be331544e9f425bdcf] | committer:
Michael Niedermayer
Merge commit 'bac0850fbf870d4354d0f68840c0b1c9c1425c4a' into release/2.2
* commit 'bac0850fbf870d4354d0f68840c0b1c9c1425c4a':
matroskadec: fix crash when parsing invalid mkv
Conflicts:
libavformat/matroskadec.c
See: d9fe6b926cd619c311e45e0ae352cf09713c482c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b34afd94ec908c051e1d76be331544e9f425bdcf
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
