Michael Niedermayer ac0f1ae64b Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  utvideoenc: Add missing AV_ prefix to codec ID
  avserver: Add missing #include for av_gettime()
  configure: Only disable aligned stack on MSVC on 32 bit
  configure: indentation cosmetics

Conflicts:
	configure

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

2012-09-12 11:46:47 +02:00

156 KiB

Raw Blame History

View Raw