Mercurial > libavformat.hg
diff asfenc.c @ 5067:499c21a8e0c2 libavformat
Remove any reference to ASFContext.packet_size and replace it with
AVFormatContext.packet_size. See "[PATCH] asf*.c/h: use
AVFormatContext->packet_size instead of own copy" thread on ML.
author | rbultje |
---|---|
date | Wed, 24 Jun 2009 23:04:05 +0000 |
parents | 33a244b7ca65 |
children | d76ffa7128d4 |
line wrap: on
line diff
--- a/asfenc.c Wed Jun 24 22:10:53 2009 +0000 +++ b/asfenc.c Wed Jun 24 23:04:05 2009 +0000 @@ -321,8 +321,8 @@ put_le64(pb, asf->duration); /* duration (in 100ns units) */ put_le64(pb, PREROLL_TIME); /* start time stamp */ put_le32(pb, (asf->is_streamed || url_is_streamed(pb)) ? 3 : 2); /* ??? */ - put_le32(pb, asf->packet_size); /* packet size */ - put_le32(pb, asf->packet_size); /* packet size */ + put_le32(pb, s->packet_size); /* packet size */ + put_le32(pb, s->packet_size); /* packet size */ put_le32(pb, bit_rate); /* Nominal data rate in bps */ end_header(pb, hpos); @@ -514,7 +514,7 @@ { ASFContext *asf = s->priv_data; - asf->packet_size = PACKET_SIZE; + s->packet_size = PACKET_SIZE; asf->nb_packets = 0; asf->last_indexed_pts = 0; @@ -536,7 +536,7 @@ asf->packet_nb_payloads = 0; asf->packet_timestamp_start = -1; asf->packet_timestamp_end = -1; - init_put_byte(&asf->pb, asf->packet_buf, asf->packet_size, 1, + init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1, NULL, NULL, NULL, NULL); return 0; @@ -612,7 +612,7 @@ assert(asf->packet_timestamp_end >= asf->packet_timestamp_start); if (asf->is_streamed) { - put_chunk(s, 0x4424, asf->packet_size, 0); + put_chunk(s, 0x4424, s->packet_size, 0); } packet_hdr_size = put_payload_parsing_info( @@ -627,14 +627,14 @@ assert(packet_hdr_size <= asf->packet_size_left); memset(asf->packet_buf + packet_filled_size, 0, asf->packet_size_left); - put_buffer(s->pb, asf->packet_buf, asf->packet_size - packet_hdr_size); + put_buffer(s->pb, asf->packet_buf, s->packet_size - packet_hdr_size); put_flush_packet(s->pb); asf->nb_packets++; asf->packet_nb_payloads = 0; asf->packet_timestamp_start = -1; asf->packet_timestamp_end = -1; - init_put_byte(&asf->pb, asf->packet_buf, asf->packet_size, 1, + init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1, NULL, NULL, NULL, NULL); }