eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

libavformat/utils: added ability to probe AVMEDIA_TYPE_DATA format

Browse Source 
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: Erkki Seppälä <erkki.seppala.ext@nokia.com>
Signed-off-by: OZOPlayer <OZOPL@nokia.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Erkki Seppälä
2016-08-23 12:03:20 +03:00
committed by Michael Niedermayer
parent 77bf96b047
commit 9d5ea8de56
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/utils.c
View File

@@ -612,6 +612,10 @@ static void force_codec_ids(AVFormatContext *s, AVStream *st)
if (s->subtitle_codec_id) if (s->subtitle_codec_id)
st->codecpar->codec_id = s->subtitle_codec_id; st->codecpar->codec_id = s->subtitle_codec_id;
break; 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); return !!av_codec_get_tag2(ofmt->codec_tag, codec_id, &codec_tag);
else if (codec_id == ofmt->video_codec || else if (codec_id == ofmt->video_codec ||
codec_id == ofmt->audio_codec || codec_id == ofmt->audio_codec ||
codec_id == ofmt->subtitle_codec) codec_id == ofmt->subtitle_codec ||
codec_id == ofmt->data_codec)
return 1; return 1;
} }
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;