[FFmpeg-cvslog] Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'

Michael Niedermayer git at videolan.org
Wed Oct 16 11:39:24 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 16 11:30:17 2013 +0200| [8895b71d6fc107c51b1bbc32323da5b2a617e842] | committer: Michael Niedermayer

Merge commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55'

* commit '29c455ce3daf7fb369ba20cf77c74bd8e3b43b55':
  bitstream: Check the result of av_malloc()

Conflicts:
	libavcodec/bitstream.c

See: aa74810fc6b9afe21c9be3725e3d078d10633670
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list