libaf: rename af_format.h to format.h

af_format.h declares some symbols which are defined in format.c. The
fact that af_format.c is a completely unrelated file is rather
confusing. Having the header and implementation file use the same base
name is more uniform. (af_format.c is the audio conversion filter, while
af_format.h and format.c are about audio formats and their properties.)

Also fix all source files which include this file.

11 files changed, 11 insertions, 11 deletions

diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c
index ee4d5d9051..ba665d9b73 100644
--- a/libao2/ao_alsa.c
+++ b/libao2/ao_alsa.c
@@ -47,7 +47,7 @@
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 
 static const ao_info_t info =
 {
diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c
index f829abbb8e..e78973ec04 100644
--- a/libao2/ao_coreaudio.c
+++ b/libao2/ao_coreaudio.c
@@ -50,7 +50,7 @@
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "osdep/timer.h"
 #include "libavutil/fifo.h"
 #include "subopt-helper.h"
diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c
index f1fc0dd00a..a72ed32022 100644
--- a/libao2/ao_dsound.c
+++ b/libao2/ao_dsound.c
@@ -33,7 +33,7 @@
 #include <math.h>
 
 #include "config.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "mp_msg.h"
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index c4bade08ec..5a80bb34bb 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -31,7 +31,7 @@
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "osdep/timer.h"
 #include "subopt-helper.h"
 
diff --git a/libao2/ao_null.c b/libao2/ao_null.c
index fddc2f6ad3..87f11a51b6 100644
--- a/libao2/ao_null.c
+++ b/libao2/ao_null.c
@@ -25,7 +25,7 @@
 
 #include "config.h"
 #include "osdep/timer.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "audio_out.h"
 
 struct priv {
diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c
index 0e04f2cc81..8245f4f1d7 100644
--- a/libao2/ao_openal.c
+++ b/libao2/ao_openal.c
@@ -39,7 +39,7 @@
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "osdep/timer.h"
 #include "subopt-helper.h"
 
diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c
index 4d51ee3832..a8d06aee00 100644
--- a/libao2/ao_oss.c
+++ b/libao2/ao_oss.c
@@ -42,7 +42,7 @@
 #endif
 #endif
 
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 
 #include "audio_out.h"
 #include "audio_out_internal.h"
diff --git a/libao2/ao_pcm.c b/libao2/ao_pcm.c
index 4f593618d8..0b1c527e89 100644
--- a/libao2/ao_pcm.c
+++ b/libao2/ao_pcm.c
@@ -29,7 +29,7 @@
 #include "talloc.h"
 
 #include "subopt-helper.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "libaf/reorder_ch.h"
 #include "audio_out.h"
 #include "mp_msg.h"
diff --git a/libao2/ao_portaudio.c b/libao2/ao_portaudio.c
index 9fa1cdbbeb..00016ac3f3 100644
--- a/libao2/ao_portaudio.c
+++ b/libao2/ao_portaudio.c
@@ -27,7 +27,7 @@
 
 #include "config.h"
 #include "subopt-helper.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "mp_msg.h"
 #include "audio_out.h"
 
diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c
index 6c8e7d3385..0b1f22ff8d 100644
--- a/libao2/ao_pulse.c
+++ b/libao2/ao_pulse.c
@@ -27,7 +27,7 @@
 #include <pulse/pulseaudio.h>
 
 #include "config.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "mp_msg.h"
 #include "audio_out.h"
 #include "input/input.h"
diff --git a/libao2/ao_rsound.c b/libao2/ao_rsound.c
index 9a8b8cb4fc..8232aad865 100644
--- a/libao2/ao_rsound.c
+++ b/libao2/ao_rsound.c
@@ -31,7 +31,7 @@
 
 #include "subopt-helper.h"
 #include "osdep/timer.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "audio_out.h"
 
 struct priv {