Mercurial > libavformat.hg
changeset 1701:90be497b752b libavformat
remove a few unused and duplicated variables
| author | michael |
|---|---|
| date | Mon, 22 Jan 2007 10:53:57 +0000 |
| parents | 77bd711c0aed |
| children | 18b502ad97f1 |
| files | asf.c asf.h |
| diffstat | 2 files changed, 4 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/asf.c Mon Jan 22 03:19:00 2007 +0000 +++ b/asf.c Mon Jan 22 10:53:57 2007 +0000 @@ -155,7 +155,7 @@ get_guid(pb, &asf->hdr.guid); asf->hdr.file_size = get_le64(pb); asf->hdr.create_time = get_le64(pb); - asf->hdr.packets_count = get_le64(pb); + asf->nb_packets = get_le64(pb); asf->hdr.send_time = get_le64(pb); asf->hdr.play_time = get_le64(pb); asf->hdr.preroll = get_le32(pb); @@ -165,7 +165,6 @@ asf->hdr.max_pktsize = get_le32(pb); asf->hdr.max_bitrate = get_le32(pb); asf->packet_size = asf->hdr.max_pktsize; - asf->nb_packets = asf->hdr.packets_count; } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { int type, type_specific_size, sizeX; uint64_t total_size; @@ -236,8 +235,8 @@ asf_st->ds_span = get_byte(pb); asf_st->ds_packet_size = get_le16(pb); asf_st->ds_chunk_size = get_le16(pb); - asf_st->ds_data_size = get_le16(pb); - asf_st->ds_silence_data = get_byte(pb); + get_le16(pb); //ds_data_size + get_byte(pb); //ds_silence_data } //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", // asf_st->ds_packet_size, asf_st->ds_chunk_size,
--- a/asf.h Mon Jan 22 03:19:00 2007 +0000 +++ b/asf.h Mon Jan 22 10:53:57 2007 +0000 @@ -31,8 +31,6 @@ int ds_span; /* descrambling */ int ds_packet_size; int ds_chunk_size; - int ds_data_size; - int ds_silence_data; int64_t packet_pos; @@ -46,8 +44,6 @@ // invalid if broadcasting uint64_t create_time; // time of creation, in 100-nanosecond units since 1.1.1601 // invalid if broadcasting - uint64_t packets_count; // how many packets are there in the file - // invalid if broadcasting uint64_t play_time; // play time, in 100-nanosecond units // invalid if broadcasting uint64_t send_time; // time to send file, in 100-nanosecond units @@ -81,7 +77,7 @@ int asfid2avid[128]; /* conversion table from asf ID 2 AVStream ID */ ASFStream streams[128]; /* it's max number and it's not that big */ /* non streamed additonnal info */ - uint64_t nb_packets; + uint64_t nb_packets; ///< how many packets are there in the file, invalid if broadcasting int64_t duration; /* in 100ns units */ /* packet filling */ unsigned char multi_payloads_present;