[FFmpeg-cvslog] Merge commit '04d2f9ace3fb6e880f3488770fc5a39de5b63cbb' into release/1.1

Michael Niedermayer git at videolan.org
Tue Oct 8 01:33:18 CEST 2013


ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Tue Oct  8 01:26:51 2013 +0200| [5da68aff96ff77b0f82d80f250e23c2f3696938b] | committer: Michael Niedermayer

Merge commit '04d2f9ace3fb6e880f3488770fc5a39de5b63cbb' into release/1.1

* commit '04d2f9ace3fb6e880f3488770fc5a39de5b63cbb':
  mvi: Add sanity checking for the audio frame size
  alac: Do bounds checking of lpc_order read from the bitstream
  xwma: Avoid division by zero
  avidec: Make sure a packet is large enough before reading its data
  vqf: Make sure the bitrate is in the valid range
  vqf: Make sure sample_rate is set to a valid value
  electronicarts: Check packet sizes before reading
  lavf: Avoid setting avg_frame_rate if delta_dts is negative
  vc1dec: Undo mpegvideo initialization if unable to allocate tables
  vc1dec: Fix leaks in ff_vc1_decode_init_alloc_tables on errors
  wnv1: Make sure the input packet is large enough
  dcadec: Validate the lfe parameter

Conflicts:
	libavcodec/dcadec.c
	libavcodec/wnv1.c
	libavformat/avidec.c
	libavformat/electronicarts.c
	libavformat/utils.c
	libavformat/xwma.c

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

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





More information about the ffmpeg-cvslog mailing list