| Message ID | 1471943019-14136-3-git-send-email-erkki.seppala.ext@nokia.com |
|---|---|
| State | Accepted |
| Commit | 9d5ea8de56fcdc77daa01cf0d413dfe6101de30a |
| Headers | show |
On Tue, Aug 23, 2016 at 12:03:20PM +0300, erkki.seppala.ext@nokia.com wrote: > From: Erkki Seppälä <erkki.seppala.ext@nokia.com> > > 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> > --- > libavformat/utils.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) applied thx [...]
diff --git a/libavformat/utils.c b/libavformat/utils.c index dd9df92..d7f3c7a 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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;