Mercurial > libavformat.hg

comparison asf.c @ 1701:90be497b752b libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove a few unused and duplicated variables
author michael
date Mon, 22 Jan 2007 10:53:57 +0000
parents 77bd711c0aed
children 18b502ad97f1
comparison
equal deleted inserted replaced
1700:77bd711c0aed 1701:90be497b752b
153 goto fail; 153 goto fail;
154 if (!memcmp(&g, &file_header, sizeof(GUID))) { 154 if (!memcmp(&g, &file_header, sizeof(GUID))) {
155 get_guid(pb, &asf->hdr.guid); 155 get_guid(pb, &asf->hdr.guid);
156 asf->hdr.file_size = get_le64(pb); 156 asf->hdr.file_size = get_le64(pb);
157 asf->hdr.create_time = get_le64(pb); 157 asf->hdr.create_time = get_le64(pb);
158 asf->hdr.packets_count = get_le64(pb); 158 asf->nb_packets = get_le64(pb);
159 asf->hdr.send_time = get_le64(pb); 159 asf->hdr.send_time = get_le64(pb);
160 asf->hdr.play_time = get_le64(pb); 160 asf->hdr.play_time = get_le64(pb);
161 asf->hdr.preroll = get_le32(pb); 161 asf->hdr.preroll = get_le32(pb);
162 asf->hdr.ignore = get_le32(pb); 162 asf->hdr.ignore = get_le32(pb);
163 asf->hdr.flags = get_le32(pb); 163 asf->hdr.flags = get_le32(pb);
164 asf->hdr.min_pktsize = get_le32(pb); 164 asf->hdr.min_pktsize = get_le32(pb);
165 asf->hdr.max_pktsize = get_le32(pb); 165 asf->hdr.max_pktsize = get_le32(pb);
166 asf->hdr.max_bitrate = get_le32(pb); 166 asf->hdr.max_bitrate = get_le32(pb);
167 asf->packet_size = asf->hdr.max_pktsize; 167 asf->packet_size = asf->hdr.max_pktsize;
168 asf->nb_packets = asf->hdr.packets_count;
169 } else if (!memcmp(&g, &stream_header, sizeof(GUID))) { 168 } else if (!memcmp(&g, &stream_header, sizeof(GUID))) {
170 int type, type_specific_size, sizeX; 169 int type, type_specific_size, sizeX;
171 uint64_t total_size; 170 uint64_t total_size;
172 unsigned int tag1; 171 unsigned int tag1;
173 int64_t pos1, pos2; 172 int64_t pos1, pos2;
234 pos2 = url_ftell(pb); 233 pos2 = url_ftell(pb);
235 if (gsize > (pos2 + 8 - pos1 + 24)) { 234 if (gsize > (pos2 + 8 - pos1 + 24)) {
236 asf_st->ds_span = get_byte(pb); 235 asf_st->ds_span = get_byte(pb);
237 asf_st->ds_packet_size = get_le16(pb); 236 asf_st->ds_packet_size = get_le16(pb);
238 asf_st->ds_chunk_size = get_le16(pb); 237 asf_st->ds_chunk_size = get_le16(pb);
239 asf_st->ds_data_size = get_le16(pb); 238 get_le16(pb); //ds_data_size
240 asf_st->ds_silence_data = get_byte(pb); 239 get_byte(pb); //ds_silence_data
241 } 240 }
242 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n", 241 //printf("Descrambling: ps:%d cs:%d ds:%d s:%d sd:%d\n",
243 // asf_st->ds_packet_size, asf_st->ds_chunk_size, 242 // asf_st->ds_packet_size, asf_st->ds_chunk_size,
244 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data); 243 // asf_st->ds_data_size, asf_st->ds_span, asf_st->ds_silence_data);
245 if (asf_st->ds_span > 1) { 244 if (asf_st->ds_span > 1) {