diff options
author | 2002-01-23 08:43:04 +0000 | |
---|---|---|
committer | 2002-01-23 08:43:04 +0000 | |
commit | cb5dbade4c8230d43d2cd5a1881039dce4e4c9c5 (patch) | |
tree | a91e8cfb9e5d04fab45b234d35a25638110e44f2 | |
parent | 88a6227cbb047d684034d459ad902bf2a7d400a7 (diff) |
Removed unused code that I commented earlier.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4311 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r-- | libmpdemux/asf.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h index dce8a1cfa2..c72982bade 100644 --- a/libmpdemux/asf.h +++ b/libmpdemux/asf.h @@ -4,10 +4,6 @@ //#include "config.h" /* for WORDS_BIGENDIAN */ #include <inttypes.h> #include "bswap.h" -#ifdef STREAMING -#include "stream.h" -#include "network.h" -#endif #ifndef MIN #define MIN(a,b) ((a<b)?a:b) @@ -48,22 +44,6 @@ typedef struct __attribute__((packed)) { ///////////////////// // ASF File Header ///////////////////// -/* Bertrand -- 2002/01/19 -- Start -- -typedef struct __attribute__((packed)) { - uint8_t client[16]; // Client GUID - uint64_t file_size; - uint64_t creat_time; //File creation time FILETIME 8 - uint64_t packets; //Number of packets UINT64 8 - uint64_t end_timestamp; //Timestamp of the end position UINT64 8 - uint64_t duration; //Duration of the playback UINT64 8 - uint32_t start_timestamp; //Timestamp of the start position UINT32 4 - uint32_t preroll; //Time to bufferize before playing UINT32 4 - uint32_t flags; //Unknown, maybe flags ( usually contains 2 ) UINT32 4 - uint32_t packetsize; //Size of packet, in bytes UINT32 4 - uint32_t packetsize2; //Size of packet ( confirm ) UINT32 4 - uint32_t frame_size; //Size of uncompressed video frame UINT32 4 -} ASF_file_header_t; -*/ typedef struct __attribute__((packed)) { uint8_t stream_id[16]; // stream GUID uint64_t file_size; @@ -77,7 +57,6 @@ typedef struct __attribute__((packed)) { uint32_t max_packet_size; //Max size of the packet UINT32 4 uint32_t max_bitrate; //Maximum bitrate of the media (sum of all the stream) } ASF_file_header_t; -// Bertrand -- 2002/01/19 -- End -- /////////////////////// // ASF Stream Header @@ -154,21 +133,6 @@ typedef enum { (h)->stream_no = le2me_16((h)->stream_no); \ (h)->unk2 = le2me_32((h)->unk2); \ } -/* Bertrand -- 2002/01/19 -- Start -- -#define le2me_ASF_file_header_t(h) { \ - (h)->file_size = le2me_64((h)->file_size); \ - (h)->creat_time = le2me_64((h)->creat_time); \ - (h)->packets = le2me_64((h)->packets); \ - (h)->end_timestamp = le2me_64((h)->end_timestamp); \ - (h)->duration = le2me_64((h)->duration); \ - (h)->start_timestamp = le2me_32((h)->start_timestamp); \ - (h)->preroll = le2me_32((h)->preroll); \ - (h)->flags = le2me_32((h)->flags); \ - (h)->packetsize = le2me_32((h)->packetsize); \ - (h)->packetsize2 = le2me_32((h)->packetsize2); \ - (h)->frame_size = le2me_32((h)->frame_size); \ -} -*/ #define le2me_ASF_file_header_t(h) { \ (h)->file_size = le2me_64((h)->file_size); \ (h)->creation_time = le2me_64((h)->creation_time); \ @@ -181,7 +145,6 @@ typedef enum { (h)->max_packet_size = le2me_32((h)->max_packet_size); \ (h)->max_bitrate = le2me_32((h)->max_bitrate); \ } -// Bertrand -- 2002/01/19 -- End -- #define le2me_ASF_content_description_t(h) { \ (h)->title_size = le2me_16((h)->title_size); \ (h)->author_size = le2me_16((h)->author_size); \ |