apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-27 02:41:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mpegts: Do not ignore registration descriptors when probing is enabled

Browse Source 
This is required for the (not yet in git) private stream detection/export,
no other testcase known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-06-10 23:16:59 +02:00
parent dc52e6200d
commit c465254fbf
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/mpegts.c
View File

@@ -1758,7 +1758,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type
case 0x05: /* registration descriptor */ case 0x05: /* registration descriptor */
st->codec->codec_tag = bytestream_get_le32(pp); st->codec->codec_tag = bytestream_get_le32(pp);
av_log(fc, AV_LOG_TRACE, "reg_desc=%.4s\n", (char *)&st->codec->codec_tag); av_log(fc, AV_LOG_TRACE, "reg_desc=%.4s\n", (char *)&st->codec->codec_tag);
if (st->codec->codec_id == AV_CODEC_ID_NONE) if (st->codec->codec_id == AV_CODEC_ID_NONE || st->request_probe > 0)
mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types); mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
break; break;
case 0x52: /* stream identifier descriptor */ case 0x52: /* stream identifier descriptor */