Merge commit 'a31c4b2cbef9aee15910fc3df52519aef46760de'

[ffmpeg] / libavformat / asf.h

diff --git a/libavformat/asf.h b/libavformat/asf.h
index 0c9598a8d8feeef09ac9d9d53b42e914b5f74a8a..0789b17d434fe989cdd2ba291cf1a53e026d923b 100644 (file)
--- a/libavformat/asf.h
+++ b/libavformat/asf.h
@@ -28,38 +28,6 @@
 
 #define PACKET_SIZE 3200
 
-typedef struct ASFPayload {
-    uint8_t type;
-    uint16_t size;
-} ASFPayload;
-
-typedef struct ASFStream {
-    int num;
-    unsigned char seq;
-    /* use for reading */
-    AVPacket pkt;
-    int frag_offset;
-    int packet_obj_size;
-    int timestamp;
-    int64_t duration;
-    int skip_to_key;
-    int pkt_clean;
-
-    int ds_span;                /* descrambling  */
-    int ds_packet_size;
-    int ds_chunk_size;
-
-    int64_t packet_pos;
-
-    uint16_t stream_language_index;
-
-    int      palette_changed;
-    uint32_t palette[256];
-
-    int payload_ext_ct;
-    ASFPayload payload[8];
-} ASFStream;
-
 typedef struct ASFMainHeader {
     ff_asf_guid guid;                  ///< generated by client computer
     uint64_t file_size;         /**< in bytes