wm4 e6e5a7b221 Merge branch 'audio_changes' ... Conflicts: audio/out/ao_lavc.c		2013-05-12 21:47:55 +02:00
..
ad.c	core: redo how codecs are mapped, remove codecs.conf	2013-02-10 17:25:56 +01:00
ad.h	Merge branch 'audio_changes'	2013-05-12 21:47:55 +02:00
ad_internal.h	audio/decode: remove vararg from ad_control()	2013-04-12 20:35:59 +02:00
ad_lavc.c	Merge branch 'audio_changes'	2013-05-12 21:47:55 +02:00
ad_mpg123.c	Merge branch 'audio_changes'	2013-05-12 21:47:55 +02:00
ad_spdif.c	Merge branch 'audio_changes'	2013-05-12 21:47:55 +02:00
dec_audio.c	audio: print channel map additionally to channel count on terminal	2013-05-12 21:24:56 +02:00
dec_audio.h	audio/out: switch to channel map	2013-05-12 21:24:54 +02:00