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.

DOCS/tech-overview.txt

@@ -169,7 +169,7 @@ libvo/:
     vo_vdpau and vo_gl3 should be taken as reference.
 
 libaf/:
-    Audio filter chain. af_format.h/format.c define the audio formats.
+    Audio filter chain. format.h/format.c define the audio formats.
 
 libao2/:
     Audio outputs. (It was probably named libao2 because libao is already

libaf/af.h

@@ -24,7 +24,7 @@
 #include "config.h"
 
 #include "options.h"
-#include "af_format.h"
+#include "libaf/format.h"
 #include "control.h"
 #include "cpudetect.h"
 #include "mp_msg.h"

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 =
 {

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"

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"

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"
 

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 {

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"
 

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"

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"

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"
 

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"

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 {

libmpcodecs/ad_internal.h

@@ -20,7 +20,7 @@
 #define MPLAYER_AD_INTERNAL_H
 
 #include "codec-cfg.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 
 #include "stream/stream.h"
 #include "libmpdemux/demuxer.h"

libmpcodecs/dec_audio.c

@@ -33,7 +33,7 @@
 
 #include "dec_audio.h"
 #include "ad.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 
 #include "libaf/af.h"
 

libmpdemux/demuxer.c

@@ -40,7 +40,7 @@
 #include "stheader.h"
 #include "mf.h"
 
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 
 #include "libavcodec/avcodec.h"
 #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE

m_option.c

@@ -951,7 +951,7 @@ const m_option_type_t m_option_type_imgfmt = {
     .copy  = copy_opt,
 };
 
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 
 static int parse_afmt(const m_option_t *opt, struct bstr name,
                       struct bstr param, void *dst)

stream/tv.c

@@ -41,7 +41,7 @@
 #include "libmpdemux/demuxer.h"
 #include "libmpdemux/stheader.h"
 
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "libmpcodecs/img_format.h"
 #include "libavutil/avstring.h"
 #include "osdep/timer.h"

stream/tvi_bsdbt848.c

@@ -78,7 +78,7 @@
 #endif
 #endif
 
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "libmpcodecs/img_format.h"
 #include "tv.h"
 #include "mp_msg.h"

stream/tvi_v4l2.c

@@ -57,7 +57,7 @@ known issues:
 #endif
 #include "mp_msg.h"
 #include "libmpcodecs/img_format.h"
-#include "libaf/af_format.h"
+#include "libaf/format.h"
 #include "tv.h"
 #include "audio_in.h"