Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
1fa395e4
Commit
1fa395e4
authored
Oct 17, 2011
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: use avpriv_ prefix for ff_new_chapter().
It's used in libavdevice.
parent
68d3aec8
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
10 deletions
+10
-10
libcdio.c
libavdevice/libcdio.c
+1
-1
asfdec.c
libavformat/asfdec.c
+1
-1
ffmetadec.c
libavformat/ffmetadec.c
+1
-1
internal.h
libavformat/internal.h
+1
-1
matroskadec.c
libavformat/matroskadec.c
+1
-1
mov.c
libavformat/mov.c
+2
-2
nutdec.c
libavformat/nutdec.c
+1
-1
oggparsevorbis.c
libavformat/oggparsevorbis.c
+1
-1
utils.c
libavformat/utils.c
+1
-1
No files found.
libavdevice/libcdio.c
View file @
1fa395e4
...
...
@@ -97,7 +97,7 @@ static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
for
(
i
=
0
;
i
<
s
->
drive
->
tracks
;
i
++
)
{
char
title
[
16
];
snprintf
(
title
,
sizeof
(
title
),
"track %02d"
,
s
->
drive
->
disc_toc
[
i
].
bTrack
);
ff
_new_chapter
(
ctx
,
i
,
st
->
time_base
,
s
->
drive
->
disc_toc
[
i
].
dwStartSector
,
avpriv
_new_chapter
(
ctx
,
i
,
st
->
time_base
,
s
->
drive
->
disc_toc
[
i
].
dwStartSector
,
s
->
drive
->
disc_toc
[
i
+
1
].
dwStartSector
,
title
);
}
...
...
libavformat/asfdec.c
View file @
1fa395e4
...
...
@@ -573,7 +573,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
name_len
=
avio_rl32
(
pb
);
// name length
if
((
ret
=
avio_get_str16le
(
pb
,
name_len
*
2
,
name
,
sizeof
(
name
)))
<
name_len
)
avio_skip
(
pb
,
name_len
-
ret
);
ff
_new_chapter
(
s
,
i
,
(
AVRational
){
1
,
10000000
},
pres_time
,
AV_NOPTS_VALUE
,
name
);
avpriv
_new_chapter
(
s
,
i
,
(
AVRational
){
1
,
10000000
},
pres_time
,
AV_NOPTS_VALUE
,
name
);
}
return
0
;
...
...
libavformat/ffmetadec.c
View file @
1fa395e4
...
...
@@ -75,7 +75,7 @@ static AVChapter *read_chapter(AVFormatContext *s)
end
=
AV_NOPTS_VALUE
;
}
return
ff
_new_chapter
(
s
,
s
->
nb_chapters
,
tb
,
start
,
end
,
NULL
);
return
avpriv
_new_chapter
(
s
,
s
->
nb_chapters
,
tb
,
start
,
end
,
NULL
);
}
static
uint8_t
*
unescape
(
uint8_t
*
buf
,
int
size
)
...
...
libavformat/internal.h
View file @
1fa395e4
...
...
@@ -225,7 +225,7 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
*
* @return AVChapter or NULL on error
*/
AVChapter
*
ff
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
AVChapter
*
avpriv
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
);
/**
...
...
libavformat/matroskadec.c
View file @
1fa395e4
...
...
@@ -1599,7 +1599,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
if
(
chapters
[
i
].
start
!=
AV_NOPTS_VALUE
&&
chapters
[
i
].
uid
&&
(
max_start
==
0
||
chapters
[
i
].
start
>
max_start
))
{
chapters
[
i
].
chapter
=
ff
_new_chapter
(
s
,
chapters
[
i
].
uid
,
(
AVRational
){
1
,
1000000000
},
avpriv
_new_chapter
(
s
,
chapters
[
i
].
uid
,
(
AVRational
){
1
,
1000000000
},
chapters
[
i
].
start
,
chapters
[
i
].
end
,
chapters
[
i
].
title
);
av_dict_set
(
&
chapters
[
i
].
chapter
->
metadata
,
...
...
libavformat/mov.c
View file @
1fa395e4
...
...
@@ -287,7 +287,7 @@ static int mov_read_chpl(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_read
(
pb
,
str
,
str_len
);
str
[
str_len
]
=
0
;
ff
_new_chapter
(
c
->
fc
,
i
,
(
AVRational
){
1
,
10000000
},
start
,
AV_NOPTS_VALUE
,
str
);
avpriv
_new_chapter
(
c
->
fc
,
i
,
(
AVRational
){
1
,
10000000
},
start
,
AV_NOPTS_VALUE
,
str
);
}
return
0
;
}
...
...
@@ -2420,7 +2420,7 @@ static void mov_read_chapters(AVFormatContext *s)
}
}
ff
_new_chapter
(
s
,
i
,
st
->
time_base
,
sample
->
timestamp
,
end
,
title
);
avpriv
_new_chapter
(
s
,
i
,
st
->
time_base
,
sample
->
timestamp
,
end
,
title
);
av_freep
(
&
title
);
}
finish:
...
...
libavformat/nutdec.c
View file @
1fa395e4
...
...
@@ -416,7 +416,7 @@ static int decode_info_header(NUTContext *nut){
if
(
chapter_id
&&
!
stream_id_plus1
){
int64_t
start
=
chapter_start
/
nut
->
time_base_count
;
chapter
=
ff
_new_chapter
(
s
,
chapter_id
,
chapter
=
avpriv
_new_chapter
(
s
,
chapter_id
,
nut
->
time_base
[
chapter_start
%
nut
->
time_base_count
],
start
,
start
+
chapter_len
,
NULL
);
metadata
=
&
chapter
->
metadata
;
...
...
libavformat/oggparsevorbis.c
View file @
1fa395e4
...
...
@@ -45,7 +45,7 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
if
(
sscanf
(
val
,
"%02d:%02d:%02d.%03d"
,
&
h
,
&
m
,
&
s
,
&
ms
)
<
4
)
return
0
;
ff
_new_chapter
(
as
,
cnum
,
(
AVRational
){
1
,
1000
},
avpriv
_new_chapter
(
as
,
cnum
,
(
AVRational
){
1
,
1000
},
ms
+
1000
*
(
s
+
60
*
(
m
+
60
*
h
)),
AV_NOPTS_VALUE
,
NULL
);
av_free
(
val
);
...
...
libavformat/utils.c
View file @
1fa395e4
...
...
@@ -2739,7 +2739,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id)
return
program
;
}
AVChapter
*
ff
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
)
AVChapter
*
avpriv
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
)
{
AVChapter
*
chapter
=
NULL
;
int
i
;
...
...
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