Fix a memory leak in audio encoding.

[nageru] / defs.h

diff --git a/defs.h b/defs.h
index 0db1920ee7883c9cf5cc7cbd3af6fc9725238a2a..0e5378c4d07e5fbee67e888c1e5adab7ad88ae5c 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_BIT_RATE 0
+#define AUDIO_OUTPUT_CODEC_NAME "pcm_s32le"
+#define DEFAULT_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" }, \
@@ -31,4 +30,8 @@
 // the output to be very uneven.
 #define MUX_BUFFER_SIZE 65536
 
+// In number of frames. Comes in addition to any internal queues in x264
+// (frame threading, lookahead, etc.).
+#define X264_QUEUE_LENGTH 50
+
 #endif  // !defined(_DEFS_H)