generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove a few unused and duplicated variables

Browse Source 
Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2007-01-22 10:53:57 +00:00
parent 079e8cb962
commit 6bb2a2dfb9
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/asf.c
View File

@ -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,

6
libavformat/asf.h
View File

@ -31,8 +31,6 @@ typedef struct {
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 @@ typedef struct {
// 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 @@ typedef struct {
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;