Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / mpegts.h

diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index eae9d46ad4b1e6e966c675a5d52dee2426676eb0..98c4b93736c2c6ae718e5ea74edb8fc3f3e02913 100644 (file)
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -65,7 +65,7 @@ int ff_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt,
                            const uint8_t *buf, int len);
 void ff_mpegts_parse_close(MpegTSContext *ts);
 
-typedef struct {
+typedef struct SLConfigDescr {
     int use_au_start;
     int use_au_end;
     int use_rand_acc_pt;
@@ -82,7 +82,7 @@ typedef struct {
     int packet_seq_num_len;
 } SLConfigDescr;
 
-typedef struct {
+typedef struct Mp4Descr {
     int es_id;
     int dec_config_descr_len;
     uint8_t *dec_config_descr;