ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Mar 12 
21:58:38 2015 +0100| [8b3a681aaa7dc209faa698c189d9b28c102bdc63] | committer: 
Michael Niedermayer

Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'

* commit '5a2645cafeca1c2207ac55cc831c3349572a82ed':
  nutdec: Prevent leaks on memory error

Conflicts:
        libavformat/nutdec.c

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

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



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

Reply via email to