RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'cc8db760616a7ec3bd39b22ca45888c01326db13' 

* commit 'cc8db760616a7ec3bd39b22ca45888c01326db13':
  mpegts: use avcodec_get_type() to set codec_type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-29 13:45:23 +02:00
parent 2f63e83c26 cc8db76061
commit 4b7685b6c6
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mpegts.c
View File

@ -1543,14 +1543,7 @@ static void m4sl_cb(MpegTSFilter *filter, const uint8_t *section,
st->codec->extradata_size > 0)
st->need_parsing = 0;
if (st->codec->codec_id <= AV_CODEC_ID_NONE) {
// do nothing
} else if (st->codec->codec_id < AV_CODEC_ID_FIRST_AUDIO)
st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
else if (st->codec->codec_id < AV_CODEC_ID_FIRST_SUBTITLE)
st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
else if (st->codec->codec_id < AV_CODEC_ID_FIRST_UNKNOWN)
st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
st->codec->codec_type = avcodec_get_type(st->codec->codec_id);
}
}
for (i = 0; i < mp4_descr_count; i++)