virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

asfenc: rename put_guid to ff_put_guid

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2011-11-05 16:09:34 +11:00 committed by Michael Niedermayer
parent 1efe4ff91d
commit b7c9512fca
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/asf.h
View File

@ -174,4 +174,6 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
extern AVInputFormat ff_asf_demuxer; extern AVInputFormat ff_asf_demuxer;
void ff_put_guid(AVIOContext *s, const ff_asf_guid *g);
#endif /* AVFORMAT_ASF_H */ #endif /* AVFORMAT_ASF_H */

28
libavformat/asfenc.c
View File

@ -223,7 +223,7 @@ static const AVCodecTag codec_asf_bmp_tags[] = {
#define PREROLL_TIME 3100 #define PREROLL_TIME 3100
static void put_guid(AVIOContext *s, const ff_asf_guid *g) void ff_put_guid(AVIOContext *s, const ff_asf_guid *g)
{ {
assert(sizeof(*g) == 16); assert(sizeof(*g) == 16);
avio_write(s, *g, sizeof(*g)); avio_write(s, *g, sizeof(*g));
@ -249,7 +249,7 @@ static int64_t put_header(AVIOContext *pb, const ff_asf_guid *g)
int64_t pos; int64_t pos;
pos = avio_tell(pb); pos = avio_tell(pb);
put_guid(pb, g); ff_put_guid(pb, g);
avio_wl64(pb, 24); avio_wl64(pb, 24);
return pos; return pos;
} }
@ -330,7 +330,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */ put_chunk(s, 0x4824, 0, 0xc00); /* start of stream (length will be patched later) */
} }
put_guid(pb, &ff_asf_header); ff_put_guid(pb, &ff_asf_header);
avio_wl64(pb, -1); /* header length, will be patched after */ avio_wl64(pb, -1); /* header length, will be patched after */
avio_wl32(pb, 3 + has_title + !!metadata_count + s->nb_streams); /* number of chunks in header */ avio_wl32(pb, 3 + has_title + !!metadata_count + s->nb_streams); /* number of chunks in header */
avio_w8(pb, 1); /* ??? */ avio_w8(pb, 1); /* ??? */
@ -339,7 +339,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* file header */ /* file header */
header_offset = avio_tell(pb); header_offset = avio_tell(pb);
hpos = put_header(pb, &ff_asf_file_header); hpos = put_header(pb, &ff_asf_file_header);
put_guid(pb, &ff_asf_my_guid); ff_put_guid(pb, &ff_asf_my_guid);
avio_wl64(pb, file_size); avio_wl64(pb, file_size);
file_time = 0; file_time = 0;
avio_wl64(pb, unix_to_file_time(file_time)); avio_wl64(pb, unix_to_file_time(file_time));
@ -355,7 +355,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* unknown headers */ /* unknown headers */
hpos = put_header(pb, &ff_asf_head1_guid); hpos = put_header(pb, &ff_asf_head1_guid);
put_guid(pb, &ff_asf_head2_guid); ff_put_guid(pb, &ff_asf_head2_guid);
avio_wl32(pb, 6); avio_wl32(pb, 6);
avio_wl16(pb, 0); avio_wl16(pb, 0);
end_header(pb, hpos); end_header(pb, hpos);
@ -418,11 +418,11 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
hpos = put_header(pb, &ff_asf_stream_header); hpos = put_header(pb, &ff_asf_stream_header);
if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
put_guid(pb, &ff_asf_audio_stream); ff_put_guid(pb, &ff_asf_audio_stream);
put_guid(pb, &ff_asf_audio_conceal_spread); ff_put_guid(pb, &ff_asf_audio_conceal_spread);
} else { } else {
put_guid(pb, &ff_asf_video_stream); ff_put_guid(pb, &ff_asf_video_stream);
put_guid(pb, &ff_asf_video_conceal_none); ff_put_guid(pb, &ff_asf_video_conceal_none);
} }
avio_wl64(pb, 0); /* ??? */ avio_wl64(pb, 0); /* ??? */
es_pos = avio_tell(pb); es_pos = avio_tell(pb);
@ -469,7 +469,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* media comments */ /* media comments */
hpos = put_header(pb, &ff_asf_codec_comment_header); hpos = put_header(pb, &ff_asf_codec_comment_header);
put_guid(pb, &ff_asf_codec_comment1_header); ff_put_guid(pb, &ff_asf_codec_comment1_header);
avio_wl32(pb, s->nb_streams); avio_wl32(pb, s->nb_streams);
for(n=0;n<s->nb_streams;n++) { for(n=0;n<s->nb_streams;n++) {
AVCodec *p; AVCodec *p;
@ -540,9 +540,9 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* movie chunk, followed by packets of packet_size */ /* movie chunk, followed by packets of packet_size */
asf->data_offset = cur_pos; asf->data_offset = cur_pos;
put_guid(pb, &ff_asf_data_header); ff_put_guid(pb, &ff_asf_data_header);
avio_wl64(pb, data_chunk_size); avio_wl64(pb, data_chunk_size);
put_guid(pb, &ff_asf_my_guid); ff_put_guid(pb, &ff_asf_my_guid);
avio_wl64(pb, asf->nb_packets); /* nb packets */ avio_wl64(pb, asf->nb_packets); /* nb packets */
avio_w8(pb, 1); /* ??? */ avio_w8(pb, 1); /* ??? */
avio_w8(pb, 1); /* ??? */ avio_w8(pb, 1); /* ??? */
@ -832,9 +832,9 @@ static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, ui
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int i; int i;
put_guid(pb, &ff_asf_simple_index_header); ff_put_guid(pb, &ff_asf_simple_index_header);
avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count); avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count);
put_guid(pb, &ff_asf_my_guid); ff_put_guid(pb, &ff_asf_my_guid);
avio_wl64(pb, ASF_INDEXED_INTERVAL); avio_wl64(pb, ASF_INDEXED_INTERVAL);
avio_wl32(pb, max); avio_wl32(pb, max);
avio_wl32(pb, count); avio_wl32(pb, count);