Michael Niedermayer 7897919a88 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>

2012-12-13 12:23:48 +01:00

9.9 KiB

Raw Blame History

View Raw