har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mpegts: make sure the "standard" code doesnt override the probing with NONE/DATA.

Browse Source 
Fixes video stream detection in vid_0x80.ts

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2011-09-15 23:01:04 +02:00
parent 5d305c9398
commit e78d1a594a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mpegts.c
View File

@ -590,6 +590,8 @@ static void mpegts_find_stream_type(AVStream *st,
static int mpegts_set_stream_info(AVStream *st, PESContext *pes, static int mpegts_set_stream_info(AVStream *st, PESContext *pes,
uint32_t stream_type, uint32_t prog_reg_desc) uint32_t stream_type, uint32_t prog_reg_desc)
{ {
int old_codec_type= st->codec->codec_type;
int old_codec_id = st->codec->codec_id;
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
st->priv_data = pes; st->priv_data = pes;
st->codec->codec_type = AVMEDIA_TYPE_DATA; st->codec->codec_type = AVMEDIA_TYPE_DATA;
@ -634,6 +636,10 @@ static int mpegts_set_stream_info(AVStream *st, PESContext *pes,
} }
if (st->codec->codec_id == CODEC_ID_NONE) if (st->codec->codec_id == CODEC_ID_NONE)
mpegts_find_stream_type(st, pes->stream_type, MISC_types); mpegts_find_stream_type(st, pes->stream_type, MISC_types);
if (st->codec->codec_id == CODEC_ID_NONE){
st->codec->codec_id = old_codec_id;
st->codec->codec_type= old_codec_type;
}
return 0; return 0;
} }