diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-01-22 10:53:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-01-22 10:53:57 +0000 |
| commit | 6bb2a2dfb9521be8e6aac02f7f398c8e2326a926 (patch) | |
| tree | 36442740aaadafc40e0a6046870e98767cf11f66 /libavformat/asf.c | |
| parent | 079e8cb9623a17f552bc98284a22ac14fbe5c3e5 (diff) | |
| download | ffmpeg-6bb2a2dfb9521be8e6aac02f7f398c8e2326a926.tar.gz | |
remove a few unused and duplicated variables
Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/asf.c')
| -rw-r--r-- | libavformat/asf.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index 3ef1c7d451..1fb80b0685 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -155,7 +155,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap) 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, |