Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Sep 2012 09:46:47 +0000 (11:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 12 Sep 2012 09:46:47 +0000 (11:46 +0200)
commitac0f1ae64bac87e8d97be5793ebb5638ac0162c3
tree31aaa07c62634415bd75d578925169ec739dd729
parentf9dd2e5e1a6c4012806001d9d4420825bb67bbb5
parent76fa7e09f18d5efa6b9c8ec5ef8d032a85e15865
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>
configure
ffserver.c
libavcodec/utvideoenc.c