[FFmpeg-cvslog] Merge commit '5a2645cafeca1c2207ac55cc831c3349572a82ed'

Michael Niedermayer git at videolan.org
Thu Mar 12 22:26:37 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | 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 <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list