Commit 9d5ea8de authored by Erkki Seppälä's avatar Erkki Seppälä Committed by Michael Niedermayer

libavformat/utils: added ability to probe AVMEDIA_TYPE_DATA format

Now force_codec_ids supports AVMEDIA_TYPE_DATA and
avformat_query_codec accepts data codecs as well in addition to video,
audio and subtitle tracks.
Signed-off-by: 's avatarErkki Seppälä <erkki.seppala.ext@nokia.com>
Signed-off-by: 's avatarOZOPlayer <OZOPL@nokia.com>
Signed-off-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parent 77bf96b0
......@@ -612,6 +612,10 @@ static void force_codec_ids(AVFormatContext *s, AVStream *st)
if (s->subtitle_codec_id)
st->codecpar->codec_id = s->subtitle_codec_id;
break;
case AVMEDIA_TYPE_DATA:
if (s->data_codec_id)
st->codec->codec_id = s->data_codec_id;
break;
}
}
......@@ -4601,7 +4605,8 @@ 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->subtitle_codec ||
codec_id == ofmt->data_codec)
return 1;
}
return AVERROR_PATCHWELCOME;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment