From 740bbba1048721c9c84ff26e0b0a2d7cf6ef12ee Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 8 Apr 2022 14:17:57 +0200
Subject: [PATCH] Tidy FFMPEG

---
 cmd/main.c         | 2 --
 ffmpeg/remuxer.c   | 2 +-
 ffmpeg/remuxer.h   | 2 ++
 http/http_ffmpeg.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmd/main.c b/cmd/main.c
index b2a842e..f4674ee 100644
--- a/cmd/main.c
+++ b/cmd/main.c
@@ -23,11 +23,9 @@ http_method_t http_methods[] = {
   { "GET /?action=stream", http_stream },
   { "GET /video?", http_content, "text/html", html_video_html, 0, &html_video_html_len },
   { "GET /video.h264?", http_h264_video },
-#ifdef USE_FFMPEG
   { "GET /video.mkv?", http_mkv_video },
   { "GET /video.mp4?", http_mp4_video },
   { "GET /jmuxer.min.js?", http_content, "text/javascript", html_jmuxer_min_js, 0, &html_jmuxer_min_js_len },
-#endif // USE_FFMPEG
   { "GET /?", http_content, "text/html", html_index_html, 0, &html_index_html_len },
   { }
 };
diff --git a/ffmpeg/remuxer.c b/ffmpeg/remuxer.c
index f1e0a5b..74aa5d2 100644
--- a/ffmpeg/remuxer.c
+++ b/ffmpeg/remuxer.c
@@ -3,10 +3,10 @@
 
 #ifdef USE_FFMPEG
 static AVRational time_base = {1, 1000LL * 1000LL};
+static int avio_ctx_buffer_size = 4096;
 
 static int ffmpeg_remuxer_init_avcontext(AVFormatContext **context, ffmpeg_remuxer_t *remuxer, int output, int (*packet)(void *opaque, uint8_t *buf, int buf_size))
 {
-  static int avio_ctx_buffer_size = 4096;
   uint8_t *buffer = NULL;
   AVIOContext *avio = NULL;
   int ret = -1;
diff --git a/ffmpeg/remuxer.h b/ffmpeg/remuxer.h
index e1861e4..e462c39 100644
--- a/ffmpeg/remuxer.h
+++ b/ffmpeg/remuxer.h
@@ -1,3 +1,5 @@
+#include <stdint.h>
+
 #ifdef USE_FFMPEG
 #include <libavcodec/avcodec.h>
 #include <libavformat/avio.h>
diff --git a/http/http_ffmpeg.c b/http/http_ffmpeg.c
index d4078c3..29cedf6 100644
--- a/http/http_ffmpeg.c
+++ b/http/http_ffmpeg.c
@@ -39,7 +39,7 @@ static int http_ffmpeg_read_from_buf(void *opaque, uint8_t *buf, int buf_size)
   if (!status->buf)
     return FFMPEG_DATA_PACKET_EOF;
 
-  buf_size = FFMIN(buf_size, status->buf->used - status->buf_offset);
+  buf_size = MIN(buf_size, status->buf->used - status->buf_offset);
   if (!buf_size)
     return FFMPEG_DATA_PACKET_EOF;