[FFmpeg-cvslog] Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 18 14:27:59 2012 +0100| [94ecbe23c52b699a8f2bda1cf71fb4efbf28679a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=94ecbe23c52b699a8f2bda1cf71fb4efbf28679a
---