[FFmpeg-cvslog] Merge commit '44079902c49e526f464bb4eb855665e1af867e91' into release/1.1

Michael Niedermayer git at videolan.org
Tue Feb 4 06:32:06 CET 2014


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Feb  4 06:17:49 2014 +0100| [e2781db62a406114519d55c31dd534db6d60dd0d] | committer: Michael Niedermayer

Merge commit '44079902c49e526f464bb4eb855665e1af867e91' into release/1.1

* commit '44079902c49e526f464bb4eb855665e1af867e91':
  mov: Free intermediate arrays in the normal cleanup function
  segafilm: fix leaks if reading the header fails
  h264_cavlc: check the size of the intra PCM data.
  h263: Check init_get_bits return value
  cavsdec: check ff_get_buffer() return value

Conflicts:
	libavcodec/cavsdec.c
	libavcodec/h263dec.c
	libavformat/mov.c

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

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





More information about the ffmpeg-cvslog mailing list