ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Jun  1 
01:59:52 2015 +0200| [3377f6fd15d7de5f574bf531c89b9670e52dc867] | committer: 
Michael Niedermayer

Merge commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47'

* commit '8df5fbf0b0c0ba12b033e61c28fc240f4bccba47':
  lcl: Check memory allocation

Conflicts:
        libavcodec/lclenc.c

See: 6dbcecd78e022493866fe39e30743284acc550b3
Merged-by: Michael Niedermayer <michae...@gmx.at>

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



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to