[FFmpeg-devel] [PATCH 12/44] avformat/utils: Move avformat_query_codec() to mux_utils.c

[Andreas Rheinhardt <andreas.rheinhardt@outlook.com>]

It is obviously muxer-only.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/mux_utils.c | 18 ++++++++++++++++++
 libavformat/utils.c     | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c
index 83c1482540..5930a7911a 100644
--- a/libavformat/mux_utils.c
+++ b/libavformat/mux_utils.c
@@ -29,6 +29,24 @@
 #include "internal.h"
 #include "mux.h"
 
+int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
+                         int std_compliance)
+{
+    if (ofmt) {
+        unsigned int codec_tag;
+        if (ofmt->query_codec)
+            return ofmt->query_codec(codec_id, std_compliance);
+        else if (ofmt->codec_tag)
+            return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
+        else if (codec_id == ofmt->video_codec ||
+                 codec_id == ofmt->audio_codec ||
+                 codec_id == ofmt->subtitle_codec ||
+                 codec_id == ofmt->data_codec)
+            return 1;
+    }
+    return AVERROR_PATCHWELCOME;
+}
+
 int ff_format_shift_data(AVFormatContext *s, int64_t read_start, int shift_size)
 {
     int ret;
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 58d2524457..640ce57f82 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1140,24 +1140,6 @@ int ff_find_stream_index(const AVFormatContext *s, int id)
     return -1;
 }
 
-int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
-                         int std_compliance)
-{
-    if (ofmt) {
-        unsigned int codec_tag;
-        if (ofmt->query_codec)
-            return ofmt->query_codec(codec_id, std_compliance);
-        else if (ofmt->codec_tag)
-            return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
-        else if (codec_id == ofmt->video_codec ||
-                 codec_id == ofmt->audio_codec ||
-                 codec_id == ofmt->subtitle_codec ||
-                 codec_id == ofmt->data_codec)
-            return 1;
-    }
-    return AVERROR_PATCHWELCOME;
-}
-
 int avformat_network_init(void)
 {
 #if CONFIG_NETWORK
-- 
2.32.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".