[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

Michael Niedermayer git at videolan.org
Sat Dec 24 01:43:55 CET 2011


ffmpeg | branch: release/0.8 | Michael Niedermayer <michaelni at gmx.at> | Sat Dec 24 01:19:33 2011 +0100| [df825c956af76ae04af18dc00403bf1a0e745af1] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/release/0.7' into release/0.8

This merge is primary for metadata, theres little actually changed
except cosmetics

* qatar/release/0.7:
  4xm: Add a check in decode_i_frame to prevent buffer overreads
  wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits.
  Update RELEASE file for 0.7.3
  swscale: #include "libavutil/mathematics.h"
  vp3dec: Check coefficient index in vp3_dequant()
  svq1dec: call avcodec_set_dimensions() after dimensions changed.
  swscale: Readd #define _SVID_SOURCE

Conflicts:
	RELEASE
	libavcodec/4xm.c
	libavcodec/vp3.c
	libswscale/utils.c

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

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





More information about the ffmpeg-cvslog mailing list