virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-11 14:30:22 +02:00
Code Issues Releases Activity

simplify

Browse Source 
Originally committed as revision 7605 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2007-01-21 12:55:31 +00:00
parent acf0b6a657
commit d65b823031
1 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
libavformat/asf-enc.c
View File

@ -210,29 +210,21 @@ static void put_guid(ByteIOContext *s, const GUID *g)
put_byte(s, g->v4[i]); put_byte(s, g->v4[i]);
} }
static void put_str16_nolen(ByteIOContext *s, const char *tag);
static void put_str16(ByteIOContext *s, const char *tag) static void put_str16(ByteIOContext *s, const char *tag)
{ {
int c;
put_le16(s,strlen(tag) + 1); put_le16(s,strlen(tag) + 1);
for(;;) { put_str16_nolen(s, tag);
c = (uint8_t)*tag++;
put_le16(s, c);
if (c == '\0')
break;
}
} }
static void put_str16_nolen(ByteIOContext *s, const char *tag) static void put_str16_nolen(ByteIOContext *s, const char *tag)
{ {
int c; int c;
for(;;) { do{
c = (uint8_t)*tag++; c = (uint8_t)*tag++;
put_le16(s, c); put_le16(s, c);
if (c == '\0') }while(c);
break;
}
} }
static int64_t put_header(ByteIOContext *pb, const GUID *g) static int64_t put_header(ByteIOContext *pb, const GUID *g)
@ -458,15 +450,13 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* id */ /* id */
if (enc->codec_type == CODEC_TYPE_AUDIO) { if (enc->codec_type == CODEC_TYPE_AUDIO) {
put_le16(pb, 2); put_le16(pb, 2);
if(!enc->codec_tag)
return -1;
put_le16(pb, enc->codec_tag); put_le16(pb, enc->codec_tag);
} else { } else {
put_le16(pb, 4); put_le16(pb, 4);
if(!enc->codec_tag)
return -1;
put_le32(pb, enc->codec_tag); put_le32(pb, enc->codec_tag);
} }
if(!enc->codec_tag)
return -1;
} }
end_header(pb, hpos); end_header(pb, hpos);
@ -751,8 +741,7 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
} else { } else {
duration = pts * 10000; duration = pts * 10000;
} }
if (duration > asf->duration) asf->duration= FFMAX(asf->duration, duration);
asf->duration = duration;
packet_st = asf->nb_packets; packet_st = asf->nb_packets;
put_frame(s, stream, pkt->pts, pkt->data, pkt->size, pkt->flags); put_frame(s, stream, pkt->pts, pkt->data, pkt->size, pkt->flags);
@ -769,8 +758,7 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt)
// store // store
asf->index_ptr[i].packet_number = (uint32_t)packet_st; asf->index_ptr[i].packet_number = (uint32_t)packet_st;
asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st); asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st);
if (asf->maximum_packet < (uint16_t)(asf->nb_packets-packet_st)) asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)(asf->nb_packets-packet_st));
asf->maximum_packet = (uint16_t)(asf->nb_packets-packet_st);
} }
asf->nb_index_count = start_sec; asf->nb_index_count = start_sec;
asf->last_indexed_pts = duration; asf->last_indexed_pts = duration;