[FFmpeg-cvslog] Merge commit '979f77b0dc40571761999633a38d97be9a1670c8' into release/0.10

Michael Niedermayer git at videolan.org
Mon Mar 10 18:24:34 CET 2014


ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 10 18:14:20 2014 +0100| [0d82c3a0ca6c5ed1e757a826b966687382f0180e] | committer: Michael Niedermayer

Merge commit '979f77b0dc40571761999633a38d97be9a1670c8' into release/0.10

* commit '979f77b0dc40571761999633a38d97be9a1670c8':
  h264: check that an IDR NAL only contains I slices
  mov: Free an earlier allocated array if allocating a new one
  segafilm: fix leaks if reading the header fails
  h264_cavlc: check the size of the intra PCM data.
  cavs: Check for negative cbp
  avi: DV in AVI must be considered single stream
  avutil: use align == 0 for default alignment in audio sample buffer functions

Conflicts:
	libavcodec/cavsdec.c
	libavutil/avutil.h

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

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





More information about the ffmpeg-cvslog mailing list