Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / shared / mux_opts.h

diff --git a/shared/mux_opts.h b/shared/mux_opts.h
deleted file mode 100644 (file)
index 0315fb8..0000000
--- a/shared/mux_opts.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef _MUX_OPTS_H
-#define _MUX_OPTS_H 1
-
-// This flag is only supported in FFmpeg 3.3 and up, and we only require 3.1.
-#if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(57, 71, 100)
-#define MUX_SKIP_TRAILER "+skip_trailer"
-#else
-#define MUX_SKIP_TRAILER ""
-#endif
-
-#define MUX_OPTS { \
-       /* Make seekable .mov files, and keep MP4 muxer from using unlimited amounts of memory. */ \
-       { "movflags", "empty_moov+frag_keyframe+default_base_moof" MUX_SKIP_TRAILER }, \
-       \
-       /* Make for somewhat less bursty stream output when using .mov. */ \
-       { "frag_duration", "125000" }, \
-       \
-       /* Keep nut muxer from using unlimited amounts of memory. */ \
-       { "write_index", "0" } \
-}
-
-#endif  // !defined(_MUX_OPTS_H)