apedec: Convert to the new bitstream reader

[ffmpeg] / libavformat / mpegts.h

diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 9f2ba3f8f33607f37bcf6a833aea6c70a8e82fb5..9f374c623e01f8ca347a97d57ab701b53fa016ab 100644 (file)
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -1,5 +1,5 @@
 /*
- * MPEG2 transport stream defines
+ * MPEG-2 transport stream defines
  * Copyright (c) 2003 Fabrice Bellard
  *
  * This file is part of Libav.
@@ -52,6 +52,8 @@
 #define STREAM_TYPE_AUDIO_AAC_LATM  0x11
 #define STREAM_TYPE_VIDEO_MPEG4     0x10
 #define STREAM_TYPE_VIDEO_H264      0x1b
+#define STREAM_TYPE_VIDEO_HEVC      0x24
+#define STREAM_TYPE_VIDEO_CAVS      0x42
 #define STREAM_TYPE_VIDEO_VC1       0xea
 #define STREAM_TYPE_VIDEO_DIRAC     0xd1
 
@@ -65,7 +67,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 +84,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;