Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
b4093e60
Commit
b4093e60
authored
Sep 20, 2017
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/caf: Support demuxing Opus.
Introduced in macOS High Sierra and iOS 11.
parent
e428e5de
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
1 deletion
+5
-1
caf.c
libavformat/caf.c
+1
-0
cafdec.c
libavformat/cafdec.c
+2
-0
cafenc.c
libavformat/cafenc.c
+1
-0
version.h
libavformat/version.h
+1
-1
No files found.
libavformat/caf.c
View file @
b4093e60
...
...
@@ -52,6 +52,7 @@ const AVCodecTag ff_codec_caf_tags[] = {
{
AV_CODEC_ID_MP2
,
MKTAG
(
'.'
,
'm'
,
'p'
,
'2'
)
},
{
AV_CODEC_ID_MP3
,
MKTAG
(
'.'
,
'm'
,
'p'
,
'3'
)
},
{
AV_CODEC_ID_MP3
,
MKTAG
(
'm'
,
's'
,
0
,
'U'
)
},
{
AV_CODEC_ID_OPUS
,
MKTAG
(
'o'
,
'p'
,
'u'
,
's'
)
},
{
AV_CODEC_ID_PCM_ALAW
,
MKTAG
(
'a'
,
'l'
,
'a'
,
'w'
)
},
{
AV_CODEC_ID_PCM_MULAW
,
MKTAG
(
'u'
,
'l'
,
'a'
,
'w'
)
},
{
AV_CODEC_ID_QCELP
,
MKTAG
(
'Q'
,
'c'
,
'l'
,
'p'
)
},
...
...
libavformat/cafdec.c
View file @
b4093e60
...
...
@@ -166,6 +166,8 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size)
}
avio_skip
(
pb
,
size
-
ALAC_NEW_KUKI
);
}
}
else
if
(
st
->
codecpar
->
codec_id
==
AV_CODEC_ID_OPUS
)
{
avio_skip
(
pb
,
size
);
}
else
{
av_freep
(
&
st
->
codecpar
->
extradata
);
if
(
ff_get_extradata
(
s
,
st
->
codecpar
,
pb
,
size
)
<
0
)
...
...
libavformat/cafenc.c
View file @
b4093e60
...
...
@@ -117,6 +117,7 @@ static int caf_write_header(AVFormatContext *s)
switch
(
par
->
codec_id
)
{
case
AV_CODEC_ID_AAC
:
case
AV_CODEC_ID_OPUS
:
av_log
(
s
,
AV_LOG_ERROR
,
"muxing codec currently unsupported
\n
"
);
return
AVERROR_PATCHWELCOME
;
}
...
...
libavformat/version.h
View file @
b4093e60
...
...
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 57
#define LIBAVFORMAT_VERSION_MINOR 82
#define LIBAVFORMAT_VERSION_MICRO 10
0
#define LIBAVFORMAT_VERSION_MICRO 10
1
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
...
...
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