Choose sample format on-the-fly instead of hard-coding it in defs.h.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index 0db1920ee7883c9cf5cc7cbd3af6fc9725238a2a..cd1e267ddd071a0d97ad7fd54d36c5e4a42e638d 100644 (file)
--- a/defs.h
+++ b/defs.h
@@ -10,13 +10,12 @@
 // For deinterlacing. See also comments on InputState.
 #define FRAME_HISTORY_LENGTH 5
 
-#define AUDIO_OUTPUT_CODEC AV_CODEC_ID_PCM_S32LE
-#define AUDIO_OUTPUT_SAMPLE_FMT AV_SAMPLE_FMT_S32
+#define AUDIO_OUTPUT_CODEC_NAME "pcm_s32le"
 #define AUDIO_OUTPUT_BIT_RATE 0
 
 #define LOCAL_DUMP_PREFIX "record-"
 #define LOCAL_DUMP_SUFFIX ".nut"
-#define STREAM_MUX_NAME "nut"
+#define DEFAULT_STREAM_MUX_NAME "nut"  // Only for HTTP. Local dump guesses from LOCAL_DUMP_SUFFIX.
 #define MUX_OPTS { \
        /* Make seekable .mov files. */ \
        { "movflags", "empty_moov+frag_keyframe+default_base_moof" }, \