ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Tue Feb 17 
22:39:32 2015 +0100| [7a7b77e6c97aabb654414044a000e8c4e9d52575] | committer: 
Michael Niedermayer

Merge commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46'

* commit '31dc73e92a96f08d07650c0e7d31c0b9a1465d46':
  vorbisdec: Check memory allocations

Conflicts:
        libavcodec/vorbisdec.c

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

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



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

Reply via email to