From cafa00841fc1d0515a2063e7c64d884ad2019658 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 29 Aug 2012 00:50:26 +0200 Subject: 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 | 2 +- libaf/af.h | 2 +- libaf/af_format.h | 135 ---------------------------------------------- libaf/format.h | 135 ++++++++++++++++++++++++++++++++++++++++++++++ libao2/ao_alsa.c | 2 +- libao2/ao_coreaudio.c | 2 +- libao2/ao_dsound.c | 2 +- libao2/ao_jack.c | 2 +- libao2/ao_null.c | 2 +- libao2/ao_openal.c | 2 +- libao2/ao_oss.c | 2 +- libao2/ao_pcm.c | 2 +- libao2/ao_portaudio.c | 2 +- libao2/ao_pulse.c | 2 +- libao2/ao_rsound.c | 2 +- libmpcodecs/ad_internal.h | 2 +- libmpcodecs/dec_audio.c | 2 +- libmpdemux/demuxer.c | 2 +- m_option.c | 2 +- stream/tv.c | 2 +- stream/tvi_bsdbt848.c | 2 +- stream/tvi_v4l2.c | 2 +- 22 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 libaf/af_format.h create mode 100644 libaf/format.h 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/af_format.h deleted file mode 100644 index 36f5c3fb59..0000000000 --- a/libaf/af_format.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * The sample format system used lin libaf is based on bitmasks. - * The format definition only refers to the storage format, - * not the resolution. - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#ifndef MPLAYER_AF_FORMAT_H -#define MPLAYER_AF_FORMAT_H - -#include -#include "config.h" -#include "bstr.h" - -// Endianness -#define AF_FORMAT_BE (0<<0) // Big Endian -#define AF_FORMAT_LE (1<<0) // Little Endian -#define AF_FORMAT_END_MASK (1<<0) - -#if BYTE_ORDER == BIG_ENDIAN -#define AF_FORMAT_NE AF_FORMAT_BE -#else -#define AF_FORMAT_NE AF_FORMAT_LE -#endif - -// Signed/unsigned -#define AF_FORMAT_SI (0<<1) // Signed -#define AF_FORMAT_US (1<<1) // Unsigned -#define AF_FORMAT_SIGN_MASK (1<<1) - -// Fixed or floating point -#define AF_FORMAT_I (0<<2) // Int -#define AF_FORMAT_F (1<<2) // Foating point -#define AF_FORMAT_POINT_MASK (1<<2) - -// Bits used -#define AF_FORMAT_8BIT (0<<3) -#define AF_FORMAT_16BIT (1<<3) -#define AF_FORMAT_24BIT (2<<3) -#define AF_FORMAT_32BIT (3<<3) -#define AF_FORMAT_40BIT (4<<3) -#define AF_FORMAT_48BIT (5<<3) -#define AF_FORMAT_BITS_MASK (7<<3) - -// Special flags refering to non pcm data -#define AF_FORMAT_MU_LAW (1<<6) -#define AF_FORMAT_A_LAW (2<<6) -#define AF_FORMAT_MPEG2 (3<<6) // MPEG(2) audio -#define AF_FORMAT_AC3 (4<<6) // Dolby Digital AC3 -#define AF_FORMAT_IMA_ADPCM (5<<6) -#define AF_FORMAT_IEC61937 (6<<6) -#define AF_FORMAT_SPECIAL_MASK (7<<6) - -// PREDEFINED formats - -#define AF_FORMAT_U8 (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_8BIT|AF_FORMAT_NE) -#define AF_FORMAT_S8 (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_8BIT|AF_FORMAT_NE) -#define AF_FORMAT_U16_LE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT|AF_FORMAT_LE) -#define AF_FORMAT_U16_BE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT|AF_FORMAT_BE) -#define AF_FORMAT_S16_LE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT|AF_FORMAT_LE) -#define AF_FORMAT_S16_BE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT|AF_FORMAT_BE) -#define AF_FORMAT_U24_LE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT|AF_FORMAT_LE) -#define AF_FORMAT_U24_BE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT|AF_FORMAT_BE) -#define AF_FORMAT_S24_LE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT|AF_FORMAT_LE) -#define AF_FORMAT_S24_BE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT|AF_FORMAT_BE) -#define AF_FORMAT_U32_LE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT|AF_FORMAT_LE) -#define AF_FORMAT_U32_BE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT|AF_FORMAT_BE) -#define AF_FORMAT_S32_LE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT|AF_FORMAT_LE) -#define AF_FORMAT_S32_BE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT|AF_FORMAT_BE) - -#define AF_FORMAT_FLOAT_LE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_LE) -#define AF_FORMAT_FLOAT_BE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_BE) - -#define AF_FORMAT_AC3_LE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_LE) -#define AF_FORMAT_AC3_BE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_BE) - -#define AF_FORMAT_IEC61937_LE (AF_FORMAT_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_LE) -#define AF_FORMAT_IEC61937_BE (AF_FORMAT_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_BE) - -#if BYTE_ORDER == BIG_ENDIAN -#define AF_FORMAT_U16_NE AF_FORMAT_U16_BE -#define AF_FORMAT_S16_NE AF_FORMAT_S16_BE -#define AF_FORMAT_U24_NE AF_FORMAT_U24_BE -#define AF_FORMAT_S24_NE AF_FORMAT_S24_BE -#define AF_FORMAT_U32_NE AF_FORMAT_U32_BE -#define AF_FORMAT_S32_NE AF_FORMAT_S32_BE -#define AF_FORMAT_FLOAT_NE AF_FORMAT_FLOAT_BE -#define AF_FORMAT_AC3_NE AF_FORMAT_AC3_BE -#define AF_FORMAT_IEC61937_NE AF_FORMAT_IEC61937_BE -#else -#define AF_FORMAT_U16_NE AF_FORMAT_U16_LE -#define AF_FORMAT_S16_NE AF_FORMAT_S16_LE -#define AF_FORMAT_U24_NE AF_FORMAT_U24_LE -#define AF_FORMAT_S24_NE AF_FORMAT_S24_LE -#define AF_FORMAT_U32_NE AF_FORMAT_U32_LE -#define AF_FORMAT_S32_NE AF_FORMAT_S32_LE -#define AF_FORMAT_FLOAT_NE AF_FORMAT_FLOAT_LE -#define AF_FORMAT_AC3_NE AF_FORMAT_AC3_LE -#define AF_FORMAT_IEC61937_NE AF_FORMAT_IEC61937_LE -#endif - -#define AF_FORMAT_UNKNOWN (-1) - -#define AF_FORMAT_IS_AC3(fmt) (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) -#define AF_FORMAT_IS_IEC61937(fmt) (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_IEC61937) - -struct af_fmt_entry { - const char *name; - int format; -}; - -extern const struct af_fmt_entry af_fmtstr_table[]; - -int af_str2fmt_short(bstr str); -int af_fmt2bits(int format); -int af_bits2fmt(int bits); -char* af_fmt2str(int format, char* str, int size); -const char* af_fmt2str_short(int format); - -#endif /* MPLAYER_AF_FORMAT_H */ diff --git a/libaf/format.h b/libaf/format.h new file mode 100644 index 0000000000..36f5c3fb59 --- /dev/null +++ b/libaf/format.h @@ -0,0 +1,135 @@ +/* + * The sample format system used lin libaf is based on bitmasks. + * The format definition only refers to the storage format, + * not the resolution. + * + * This file is part of MPlayer. + * + * MPlayer is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * MPlayer is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef MPLAYER_AF_FORMAT_H +#define MPLAYER_AF_FORMAT_H + +#include +#include "config.h" +#include "bstr.h" + +// Endianness +#define AF_FORMAT_BE (0<<0) // Big Endian +#define AF_FORMAT_LE (1<<0) // Little Endian +#define AF_FORMAT_END_MASK (1<<0) + +#if BYTE_ORDER == BIG_ENDIAN +#define AF_FORMAT_NE AF_FORMAT_BE +#else +#define AF_FORMAT_NE AF_FORMAT_LE +#endif + +// Signed/unsigned +#define AF_FORMAT_SI (0<<1) // Signed +#define AF_FORMAT_US (1<<1) // Unsigned +#define AF_FORMAT_SIGN_MASK (1<<1) + +// Fixed or floating point +#define AF_FORMAT_I (0<<2) // Int +#define AF_FORMAT_F (1<<2) // Foating point +#define AF_FORMAT_POINT_MASK (1<<2) + +// Bits used +#define AF_FORMAT_8BIT (0<<3) +#define AF_FORMAT_16BIT (1<<3) +#define AF_FORMAT_24BIT (2<<3) +#define AF_FORMAT_32BIT (3<<3) +#define AF_FORMAT_40BIT (4<<3) +#define AF_FORMAT_48BIT (5<<3) +#define AF_FORMAT_BITS_MASK (7<<3) + +// Special flags refering to non pcm data +#define AF_FORMAT_MU_LAW (1<<6) +#define AF_FORMAT_A_LAW (2<<6) +#define AF_FORMAT_MPEG2 (3<<6) // MPEG(2) audio +#define AF_FORMAT_AC3 (4<<6) // Dolby Digital AC3 +#define AF_FORMAT_IMA_ADPCM (5<<6) +#define AF_FORMAT_IEC61937 (6<<6) +#define AF_FORMAT_SPECIAL_MASK (7<<6) + +// PREDEFINED formats + +#define AF_FORMAT_U8 (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_8BIT|AF_FORMAT_NE) +#define AF_FORMAT_S8 (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_8BIT|AF_FORMAT_NE) +#define AF_FORMAT_U16_LE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT|AF_FORMAT_LE) +#define AF_FORMAT_U16_BE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_16BIT|AF_FORMAT_BE) +#define AF_FORMAT_S16_LE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT|AF_FORMAT_LE) +#define AF_FORMAT_S16_BE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_16BIT|AF_FORMAT_BE) +#define AF_FORMAT_U24_LE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT|AF_FORMAT_LE) +#define AF_FORMAT_U24_BE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_24BIT|AF_FORMAT_BE) +#define AF_FORMAT_S24_LE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT|AF_FORMAT_LE) +#define AF_FORMAT_S24_BE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_24BIT|AF_FORMAT_BE) +#define AF_FORMAT_U32_LE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT|AF_FORMAT_LE) +#define AF_FORMAT_U32_BE (AF_FORMAT_I|AF_FORMAT_US|AF_FORMAT_32BIT|AF_FORMAT_BE) +#define AF_FORMAT_S32_LE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT|AF_FORMAT_LE) +#define AF_FORMAT_S32_BE (AF_FORMAT_I|AF_FORMAT_SI|AF_FORMAT_32BIT|AF_FORMAT_BE) + +#define AF_FORMAT_FLOAT_LE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_LE) +#define AF_FORMAT_FLOAT_BE (AF_FORMAT_F|AF_FORMAT_32BIT|AF_FORMAT_BE) + +#define AF_FORMAT_AC3_LE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_LE) +#define AF_FORMAT_AC3_BE (AF_FORMAT_AC3|AF_FORMAT_16BIT|AF_FORMAT_BE) + +#define AF_FORMAT_IEC61937_LE (AF_FORMAT_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_LE) +#define AF_FORMAT_IEC61937_BE (AF_FORMAT_IEC61937|AF_FORMAT_16BIT|AF_FORMAT_BE) + +#if BYTE_ORDER == BIG_ENDIAN +#define AF_FORMAT_U16_NE AF_FORMAT_U16_BE +#define AF_FORMAT_S16_NE AF_FORMAT_S16_BE +#define AF_FORMAT_U24_NE AF_FORMAT_U24_BE +#define AF_FORMAT_S24_NE AF_FORMAT_S24_BE +#define AF_FORMAT_U32_NE AF_FORMAT_U32_BE +#define AF_FORMAT_S32_NE AF_FORMAT_S32_BE +#define AF_FORMAT_FLOAT_NE AF_FORMAT_FLOAT_BE +#define AF_FORMAT_AC3_NE AF_FORMAT_AC3_BE +#define AF_FORMAT_IEC61937_NE AF_FORMAT_IEC61937_BE +#else +#define AF_FORMAT_U16_NE AF_FORMAT_U16_LE +#define AF_FORMAT_S16_NE AF_FORMAT_S16_LE +#define AF_FORMAT_U24_NE AF_FORMAT_U24_LE +#define AF_FORMAT_S24_NE AF_FORMAT_S24_LE +#define AF_FORMAT_U32_NE AF_FORMAT_U32_LE +#define AF_FORMAT_S32_NE AF_FORMAT_S32_LE +#define AF_FORMAT_FLOAT_NE AF_FORMAT_FLOAT_LE +#define AF_FORMAT_AC3_NE AF_FORMAT_AC3_LE +#define AF_FORMAT_IEC61937_NE AF_FORMAT_IEC61937_LE +#endif + +#define AF_FORMAT_UNKNOWN (-1) + +#define AF_FORMAT_IS_AC3(fmt) (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_AC3) +#define AF_FORMAT_IS_IEC61937(fmt) (((fmt) & AF_FORMAT_SPECIAL_MASK) == AF_FORMAT_IEC61937) + +struct af_fmt_entry { + const char *name; + int format; +}; + +extern const struct af_fmt_entry af_fmtstr_table[]; + +int af_str2fmt_short(bstr str); +int af_fmt2bits(int format); +int af_bits2fmt(int bits); +char* af_fmt2str(int format, char* str, int size); +const char* af_fmt2str_short(int format); + +#endif /* MPLAYER_AF_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 #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 #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" -- cgit v1.2.3