From 5b3c4c8ac681ae7ccf3c50e8a8b17f0209277456 Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Sun, 31 May 2009 04:04:20 +0000 Subject: [PATCH] set codec_tag to registration descriptor if present Originally committed as revision 19012 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/mpegts.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 0698721d26..61f91fdaed 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -590,7 +590,6 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int comp_page, anc_page; char language[4]; uint32_t prog_reg_desc = 0; /* registration descriptor */ - uint32_t reg_desc; /* registration descriptor */ #ifdef DEBUG dprintf(ts->stream, "PMT: len %i\n", section_len); @@ -707,10 +706,10 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len av_metadata_set(&st->metadata, "language", language); break; case 0x05: /* registration descriptor */ - reg_desc = bytestream_get_le32(&p); + st->codec->codec_tag = bytestream_get_le32(&p); if (st->codec->codec_id == CODEC_ID_PROBE && stream_type == STREAM_TYPE_PRIVATE_DATA) - mpegts_find_stream_type(st, reg_desc, REGD_types); + mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types); break; default: break;