From ad6c7c1b525c7ae365491b4fef7869d31ee88329 Mon Sep 17 00:00:00 2001
From: Alex Converse <alex.converse@gmail.com>
Date: Wed, 24 Aug 2011 16:59:30 -0700
Subject: mp4: Handle non-trivial ES Descriptors.

---
 libavformat/mpegts.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'libavformat/mpegts.c')

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);
-- 
cgit v1.2.3