Merge remote-tracking branch 'qatar/release/0.6' into release/0.6
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Nov 2011 00:50:29 +0000 (01:50 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 6 Nov 2011 00:50:29 +0000 (01:50 +0100)
commit603a282f8ff1a84677fc0279b6d83e4a23729675
tree08060d5f3901ac2b7373f0d97854d457519956ee
parent39c8434bced9a860388628e624170665ddff0e44
parent973d752dfbfb3286c6494f99744f386b98fda4d7
Merge remote-tracking branch 'qatar/release/0.6' into release/0.6

* qatar/release/0.6:
  update version
  Release notes and changelog for 0.6.3
  Fix memory (re)allocation in matroskadec.c, related to MSVR-11-0080.
  cavs: fix some crashes with invalid bitstreams
  libvo-aacenc: Sync up with 0.7.2
  Fix MMX rgb24 to yuv conversion with gcc 4.6
  oggdec: prevent heap corruption.
  Fix ff_imdct_calc_sse() on gcc-4.6
  backport libvo-aacenc wrapper for aac encoding

Conflicts:
Changelog
VERSION

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