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
f9f34cb9
Commit
f9f34cb9
authored
Aug 23, 2014
by
Luca Barbato
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ogg: Use separate classes for the aliases
Unbreak
051aadee
parent
3526ab89
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
9 deletions
+13
-9
oggenc.c
libavformat/oggenc.c
+13
-9
No files found.
libavformat/oggenc.c
View file @
f9f34cb9
...
...
@@ -84,14 +84,14 @@ static const AVOption options[] = {
{
NULL
},
};
static
const
AVClass
ogg_muxer_class
=
{
.
class_name
=
"Ogg muxer"
,
.
item_name
=
av_default_item_name
,
.
option
=
options
,
.
version
=
LIBAVUTIL_VERSION_INT
,
#define OGG_CLASS(flavor)\
static const AVClass flavor ## _muxer_class = {\
.class_name = #flavor " muxer",\
.item_name = av_default_item_name,\
.option = options,\
.version = LIBAVUTIL_VERSION_INT,\
};
static
void
ogg_update_checksum
(
AVFormatContext
*
s
,
AVIOContext
*
pb
,
int64_t
crc_offset
)
{
int64_t
pos
=
avio_tell
(
pb
);
...
...
@@ -628,6 +628,7 @@ static int ogg_write_trailer(AVFormatContext *s)
}
#if CONFIG_OGG_MUXER
OGG_CLASS
(
ogg
)
AVOutputFormat
ff_ogg_muxer
=
{
.
name
=
"ogg"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Ogg"
),
...
...
@@ -646,6 +647,7 @@ AVOutputFormat ff_ogg_muxer = {
#endif
#if CONFIG_OGA_MUXER
OGG_CLASS
(
oga
)
AVOutputFormat
ff_oga_muxer
=
{
.
name
=
"oga"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Ogg Audio"
),
...
...
@@ -658,11 +660,12 @@ AVOutputFormat ff_oga_muxer = {
.
write_packet
=
ogg_write_packet
,
.
write_trailer
=
ogg_write_trailer
,
.
flags
=
AVFMT_TS_NEGATIVE
|
AVFMT_ALLOW_FLUSH
,
.
priv_class
=
&
og
g
_muxer_class
,
.
priv_class
=
&
og
a
_muxer_class
,
};
#endif
#if CONFIG_SPX_MUXER
OGG_CLASS
(
spx
)
AVOutputFormat
ff_spx_muxer
=
{
.
name
=
"spx"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Ogg Speex"
),
...
...
@@ -674,11 +677,12 @@ AVOutputFormat ff_spx_muxer = {
.
write_packet
=
ogg_write_packet
,
.
write_trailer
=
ogg_write_trailer
,
.
flags
=
AVFMT_TS_NEGATIVE
|
AVFMT_ALLOW_FLUSH
,
.
priv_class
=
&
ogg
_muxer_class
,
.
priv_class
=
&
spx
_muxer_class
,
};
#endif
#if CONFIG_OPUS_MUXER
OGG_CLASS
(
opus
)
AVOutputFormat
ff_opus_muxer
=
{
.
name
=
"opus"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Ogg Opus"
),
...
...
@@ -690,6 +694,6 @@ AVOutputFormat ff_opus_muxer = {
.
write_packet
=
ogg_write_packet
,
.
write_trailer
=
ogg_write_trailer
,
.
flags
=
AVFMT_TS_NEGATIVE
|
AVFMT_ALLOW_FLUSH
,
.
priv_class
=
&
o
gg
_muxer_class
,
.
priv_class
=
&
o
pus
_muxer_class
,
};
#endif
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