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)
commit7897919a88cd4be607497a367203e55fe11df9f0
tree56727965b7a38e52c63962a1a794b575d991437b
parent2e5e2bf935ae91b3113f480086c0652f17935b0c
parent6d5b0092678b2a95dfe209a207550bd2fe9ef646
Merge remote-tracking branch 'qatar/master'

* 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>
libavformat/rtpproto.c
libavutil/x86/x86inc.asm