ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Mar 12 
23:50:41 2015 +0100| [b0112019f918b24b085395be243be91a196e73af] | committer: 
Michael Niedermayer

Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'

* commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd':
  matroskadec: Check memory allocations

Conflicts:
        libavformat/matroskadec.c

See: 3e2a5b33f0355eeb80b6b2805be7f1b4fa1d1a46
Merged-by: Michael Niedermayer <[email protected]>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b0112019f918b24b085395be243be91a196e73af
---



_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to