diff options
author | wm4 <wm4@nowhere> | 2012-08-29 00:50:26 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-08-29 00:50:26 +0200 |
commit | cafa00841fc1d0515a2063e7c64d884ad2019658 (patch) | |
tree | acc85fcb96b0e166c2a5836f1784418df7391213 | |
parent | 7c45be712f93dc965fd6c8393aa476d42cbbd64d (diff) | |
download | mpv-cafa00841fc1d0515a2063e7c64d884ad2019658.tar.bz2 mpv-cafa00841fc1d0515a2063e7c64d884ad2019658.tar.xz |
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.
-rw-r--r-- | DOCS/tech-overview.txt | 2 | ||||
-rw-r--r-- | libaf/af.h | 2 | ||||
-rw-r--r-- | libaf/format.h (renamed from libaf/af_format.h) | 0 | ||||
-rw-r--r-- | libao2/ao_alsa.c | 2 | ||||
-rw-r--r-- | libao2/ao_coreaudio.c | 2 | ||||
-rw-r--r-- | libao2/ao_dsound.c | 2 | ||||
-rw-r--r-- | libao2/ao_jack.c | 2 | ||||
-rw-r--r-- | libao2/ao_null.c | 2 | ||||
-rw-r--r-- | libao2/ao_openal.c | 2 | ||||
-rw-r--r-- | libao2/ao_oss.c | 2 | ||||
-rw-r--r-- | libao2/ao_pcm.c | 2 | ||||
-rw-r--r-- | libao2/ao_portaudio.c | 2 | ||||
-rw-r--r-- | libao2/ao_pulse.c | 2 | ||||
-rw-r--r-- | libao2/ao_rsound.c | 2 | ||||
-rw-r--r-- | libmpcodecs/ad_internal.h | 2 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.c | 2 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
-rw-r--r-- | m_option.c | 2 | ||||
-rw-r--r-- | stream/tv.c | 2 | ||||
-rw-r--r-- | stream/tvi_bsdbt848.c | 2 | ||||
-rw-r--r-- | stream/tvi_v4l2.c | 2 |
21 files changed, 20 insertions, 20 deletions
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt index 6243d358ba..7faffec616 100644 --- a/DOCS/tech-overview.txt +++ b/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 diff --git a/libaf/af.h b/libaf/af.h index ceca34c90d..4542b32c60 100644 --- a/libaf/af.h +++ b/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" diff --git a/libaf/af_format.h b/libaf/format.h index 36f5c3fb59..36f5c3fb59 100644 --- a/libaf/af_format.h +++ b/libaf/format.h 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 { diff --git a/libmpcodecs/ad_internal.h b/libmpcodecs/ad_internal.h index a04d3f6165..4cffc95126 100644 --- a/libmpcodecs/ad_internal.h +++ b/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" diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index 48526b2390..5a77dfe6d1 100644 --- a/libmpcodecs/dec_audio.c +++ b/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" diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 64533e9307..bc2e132c60 100644 --- a/libmpdemux/demuxer.c +++ b/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 diff --git a/m_option.c b/m_option.c index e4c7759f50..583c2252c5 100644 --- a/m_option.c +++ b/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) diff --git a/stream/tv.c b/stream/tv.c index 10ae7132f5..57a94fdf82 100644 --- a/stream/tv.c +++ b/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" diff --git a/stream/tvi_bsdbt848.c b/stream/tvi_bsdbt848.c index 9e2a77a542..0286c0ed05 100644 --- a/stream/tvi_bsdbt848.c +++ b/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" diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index 0490677961..4a5a2d4141 100644 --- a/stream/tvi_v4l2.c +++ b/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" |