summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-29 00:50:26 +0200
committerwm4 <wm4@nowhere>2012-08-29 00:50:26 +0200
commitcafa00841fc1d0515a2063e7c64d884ad2019658 (patch)
treeacc85fcb96b0e166c2a5836f1784418df7391213 /stream
parent7c45be712f93dc965fd6c8393aa476d42cbbd64d (diff)
downloadmpv-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.
Diffstat (limited to 'stream')
-rw-r--r--stream/tv.c2
-rw-r--r--stream/tvi_bsdbt848.c2
-rw-r--r--stream/tvi_v4l2.c2
3 files changed, 3 insertions, 3 deletions
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"