Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
b7c9512f
Commit
b7c9512f
authored
Nov 05, 2011
by
Peter Ross
Committed by
Michael Niedermayer
Nov 05, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asfenc: rename put_guid to ff_put_guid
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
1efe4ff9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
14 deletions
+16
-14
asf.h
libavformat/asf.h
+2
-0
asfenc.c
libavformat/asfenc.c
+14
-14
No files found.
libavformat/asf.h
View file @
b7c9512f
...
...
@@ -174,4 +174,6 @@ extern const AVMetadataConv ff_asf_metadata_conv[];
extern
AVInputFormat
ff_asf_demuxer
;
void
ff_put_guid
(
AVIOContext
*
s
,
const
ff_asf_guid
*
g
);
#endif
/* AVFORMAT_ASF_H */
libavformat/asfenc.c
View file @
b7c9512f
...
...
@@ -223,7 +223,7 @@ static const AVCodecTag codec_asf_bmp_tags[] = {
#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
);
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
;
pos
=
avio_tell
(
pb
);
put_guid
(
pb
,
g
);
ff_
put_guid
(
pb
,
g
);
avio_wl64
(
pb
,
24
);
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_guid
(
pb
,
&
ff_asf_header
);
ff_
put_guid
(
pb
,
&
ff_asf_header
);
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_w8
(
pb
,
1
);
/* ??? */
...
...
@@ -339,7 +339,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data
/* file header */
header_offset
=
avio_tell
(
pb
);
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
);
file_time
=
0
;
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 */
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_wl16
(
pb
,
0
);
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
);
if
(
enc
->
codec_type
==
AVMEDIA_TYPE_AUDIO
)
{
put_guid
(
pb
,
&
ff_asf_audio_stream
);
put_guid
(
pb
,
&
ff_asf_audio_conceal_spread
);
ff_
put_guid
(
pb
,
&
ff_asf_audio_stream
);
ff_
put_guid
(
pb
,
&
ff_asf_audio_conceal_spread
);
}
else
{
put_guid
(
pb
,
&
ff_asf_video_stream
);
put_guid
(
pb
,
&
ff_asf_video_conceal_none
);
ff_
put_guid
(
pb
,
&
ff_asf_video_stream
);
ff_
put_guid
(
pb
,
&
ff_asf_video_conceal_none
);
}
avio_wl64
(
pb
,
0
);
/* ??? */
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 */
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
);
for
(
n
=
0
;
n
<
s
->
nb_streams
;
n
++
)
{
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 */
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
);
put_guid
(
pb
,
&
ff_asf_my_guid
);
ff_
put_guid
(
pb
,
&
ff_asf_my_guid
);
avio_wl64
(
pb
,
asf
->
nb_packets
);
/* nb packets */
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
;
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
);
put_guid
(
pb
,
&
ff_asf_my_guid
);
ff_
put_guid
(
pb
,
&
ff_asf_my_guid
);
avio_wl64
(
pb
,
ASF_INDEXED_INTERVAL
);
avio_wl32
(
pb
,
max
);
avio_wl32
(
pb
,
count
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment