Michael Niedermayer
94ecbe23c5
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>
2012-12-18 14:27:59 +01:00
2012-11-15 11:12:25 +01:00
2012-10-31 20:01:08 +01:00
2012-12-03 02:33:27 +01:00
2012-11-29 13:24:48 +00:00
2012-11-20 00:26:46 -05:00
2012-10-18 13:12:28 +01:00
2012-11-14 15:09:59 +01:00
2012-11-14 15:09:59 +01:00
2012-11-14 15:09:59 +01:00
2012-11-04 19:11:26 +00:00
2012-12-02 14:44:26 +01:00
2012-12-05 13:01:22 +00:00
2012-12-04 15:24:05 +01:00
2012-12-04 15:24:05 +01:00
2012-07-20 10:17:25 +02:00
2012-12-11 11:34:47 +00:00
2012-12-04 15:24:05 +01:00
2012-12-07 11:34:16 +01:00
2012-12-04 14:23:22 +01:00
2012-09-22 09:34:56 +02:00
2012-12-03 01:34:14 +01:00
2012-12-14 19:02:39 +01:00
2012-11-05 15:32:30 -05:00
2012-12-04 14:23:22 +01:00
2012-12-07 15:21:41 +01:00
2012-10-18 13:12:28 +01:00
2012-10-23 10:52:15 +02:00
2012-10-23 10:28:40 +02:00
2012-11-29 14:16:46 +01:00
2012-12-18 14:27:59 +01:00
2012-10-19 14:15:47 +02:00
2012-10-23 02:19:38 +02:00
2012-10-20 12:37:52 +02:00
2012-12-05 13:34:45 +01:00
2012-10-18 13:12:28 +01:00
2012-06-30 13:49:43 +02:00
2012-05-27 15:42:55 +02:00
2012-08-04 09:49:30 +02:00
2012-11-29 13:35:56 +01:00
2012-10-19 14:15:47 +02:00
2012-11-28 14:45:28 +01:00
2012-12-18 14:27:59 +01:00
2012-10-19 13:58:14 +02:00
2012-12-03 03:15:41 +01:00
2012-10-20 12:37:52 +02:00
2012-11-29 13:35:56 +01:00
2012-12-03 02:33:27 +01:00
2012-11-17 13:06:12 +01:00
2012-10-10 14:13:51 +02:00
2012-11-28 14:45:28 +01:00
2012-11-29 13:45:57 +01:00
2012-10-19 13:47:47 +02:00
2012-11-28 16:05:44 +01:00
2012-10-23 10:28:40 +02:00
94ecbe23c5