Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Dec 2012 11:23:48 +0000 (12:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Dec 2012 11:23:48 +0000 (12:23 +0100)
* qatar/master:
  aacdec: Fix an off-by-one overwrite when switching to LTP profile from MAIN.
  x86inc: fix stack alignment on win64
  rtpproto: Remove unused defines

Conflicts:
libavcodec/aacdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpproto.c
libavutil/x86/x86inc.asm

Simple merge
Simple merge