diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-08-24 16:59:30 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-08-25 11:53:21 -0700 |
| commit | ad6c7c1b525c7ae365491b4fef7869d31ee88329 (patch) | |
| tree | ec0e580b4d5657d1ca4d98e3537eb27941c4a6fc /libavformat/mpegts.c | |
| parent | d4b9974465baf893e90527a366e7a7411ded1ef8 (diff) | |
| download | ffmpeg-ad6c7c1b525c7ae365491b4fef7869d31ee88329.tar.gz | |
mp4: Handle non-trivial ES Descriptors.
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index fa5bd4c5a1..a72341865f 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -886,9 +886,8 @@ static int mp4_read_iods(AVFormatContext *s, const uint8_t *buf, unsigned size, avio_r8(&pb); len = ff_mp4_read_descr(s, &pb, &tag); if (tag == MP4ESDescrTag) { - *es_id = avio_rb16(&pb); /* ES_ID */ + ff_mp4_parse_es_descr(&pb, es_id); av_dlog(s, "ES_ID %#x\n", *es_id); - avio_r8(&pb); /* priority */ len = ff_mp4_read_descr(s, &pb, &tag); if (tag == MP4DecConfigDescrTag) { *dec_config_descr = av_malloc(len); |