Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Dec 2012 13:27:59 +0000 (14:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 18 Dec 2012 13:27:59 +0000 (14:27 +0100)
commit94ecbe23c52b699a8f2bda1cf71fb4efbf28679a
tree240b05c733a4d256ffbffa74f80fa3dcea49fc81
parent95015634f5017897a61f4883bc217b0f7efbc40c
parentc35f0e8495e34c2082dcde805e9323c9f6a4cb0a
Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'

* commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a':
  au: Reorder code so that both muxer and demuxer are under #ifdefs
  fate: Move RALF test into lossless audio group
  cosmetics: Use consistent names for multiple inclusion guards.

Conflicts:
libavformat/au.c
tests/fate/lossless-audio.mak
tests/fate/real.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/gsmdec_data.h
libavcodec/options_table.h
libavformat/au.c
libavformat/options_table.h
tests/fate/lossless-audio.mak
tests/fate/real.mak