aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2023-01-27 15:05:56 +0100
committerAnton Khirnov <anton@khirnov.net>2023-02-09 15:24:15 +0100
commit145f6b22231b84e59cc26a350b6c2a6237b2113d (patch)
tree39a39a840f03719ef704981fbea143387a6cf3f5
parent42a0dd6e7e3bc343d65a5499bd1373ad15160ab7 (diff)
downloadffmpeg-145f6b22231b84e59cc26a350b6c2a6237b2113d.tar.gz
avformat/avformat: Remove AVOutputFormat.data_codec
No AVOutputFormat has this set. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavformat/avformat.h1
-rw-r--r--libavformat/format.c2
-rw-r--r--libavformat/mux_utils.c3
3 files changed, 1 insertions, 5 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h
index 1d97d56ac5..53bbc0063f 100644
--- a/libavformat/avformat.h
+++ b/libavformat/avformat.h
@@ -614,7 +614,6 @@ typedef struct AVOutputFormat {
* @see avdevice_list_devices() for more details.
*/
int (*get_device_list)(struct AVFormatContext *s, struct AVDeviceInfoList *device_list);
- enum AVCodecID data_codec; /**< default data codec */
/**
* Initialize format. May allocate data here, and set any AVFormatContext or
* AVStream parameters that need to be set before packets are sent.
diff --git a/libavformat/format.c b/libavformat/format.c
index 4b1f3c2986..76f25ab5a6 100644
--- a/libavformat/format.c
+++ b/libavformat/format.c
@@ -111,8 +111,6 @@ enum AVCodecID av_guess_codec(const AVOutputFormat *fmt, const char *short_name,
return fmt->audio_codec;
else if (type == AVMEDIA_TYPE_SUBTITLE)
return fmt->subtitle_codec;
- else if (type == AVMEDIA_TYPE_DATA)
- return fmt->data_codec;
else
return AV_CODEC_ID_NONE;
}
diff --git a/libavformat/mux_utils.c b/libavformat/mux_utils.c
index 764c834fa2..55e58ae9d6 100644
--- a/libavformat/mux_utils.c
+++ b/libavformat/mux_utils.c
@@ -51,8 +51,7 @@ int avformat_query_codec(const AVOutputFormat *ofmt, enum AVCodecID codec_id,
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)
+ codec_id == ofmt->subtitle_codec)
return 1;
}
return AVERROR_PATCHWELCOME;