mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
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>
This commit is contained in:
parent
42a0dd6e7e
commit
145f6b2223
@ -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.
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user