Skip to content
Snippets Groups Projects
Commit 94ecbe23 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit 'c35f0e84'


* commit 'c35f0e84':
  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: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 95015634 c35f0e84
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment