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
7581ad24
Commit
7581ad24
authored
Nov 08, 2012
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc/aac: fix shared build failures with MSVC.
This is a workaround until a better solution is found.
parent
0e239b22
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
2 deletions
+18
-2
aacenc.c
libavcodec/aacenc.c
+8
-1
libvo-aacenc.c
libavcodec/libvo-aacenc.c
+8
-1
mpeg4audio.c
libavcodec/mpeg4audio.c
+2
-0
No files found.
libavcodec/aacenc.c
View file @
7581ad24
...
...
@@ -811,6 +811,13 @@ static const AVClass aacenc_class = {
LIBAVUTIL_VERSION_INT
,
};
/* duplicated from avpriv_mpeg4audio_sample_rates to avoid shared build
* failures */
static
const
int
mpeg4audio_sample_rates
[
16
]
=
{
96000
,
88200
,
64000
,
48000
,
44100
,
32000
,
24000
,
22050
,
16000
,
12000
,
11025
,
8000
,
7350
};
AVCodec
ff_aac_encoder
=
{
.
name
=
"aac"
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
...
...
@@ -819,7 +826,7 @@ AVCodec ff_aac_encoder = {
.
init
=
aac_encode_init
,
.
encode2
=
aac_encode_frame
,
.
close
=
aac_encode_end
,
.
supported_samplerates
=
avpriv_
mpeg4audio_sample_rates
,
.
supported_samplerates
=
mpeg4audio_sample_rates
,
.
capabilities
=
CODEC_CAP_SMALL_LAST_FRAME
|
CODEC_CAP_DELAY
|
CODEC_CAP_EXPERIMENTAL
,
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_FLTP
,
...
...
libavcodec/libvo-aacenc.c
View file @
7581ad24
...
...
@@ -185,6 +185,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return
0
;
}
/* duplicated from avpriv_mpeg4audio_sample_rates to avoid shared build
* failures */
static
const
int
mpeg4audio_sample_rates
[
16
]
=
{
96000
,
88200
,
64000
,
48000
,
44100
,
32000
,
24000
,
22050
,
16000
,
12000
,
11025
,
8000
,
7350
};
AVCodec
ff_libvo_aacenc_encoder
=
{
.
name
=
"libvo_aacenc"
,
.
type
=
AVMEDIA_TYPE_AUDIO
,
...
...
@@ -193,7 +200,7 @@ AVCodec ff_libvo_aacenc_encoder = {
.
init
=
aac_encode_init
,
.
encode2
=
aac_encode_frame
,
.
close
=
aac_encode_close
,
.
supported_samplerates
=
avpriv_
mpeg4audio_sample_rates
,
.
supported_samplerates
=
mpeg4audio_sample_rates
,
.
capabilities
=
CODEC_CAP_SMALL_LAST_FRAME
|
CODEC_CAP_DELAY
,
.
sample_fmts
=
(
const
enum
AVSampleFormat
[]){
AV_SAMPLE_FMT_S16
,
AV_SAMPLE_FMT_NONE
},
...
...
libavcodec/mpeg4audio.c
View file @
7581ad24
...
...
@@ -52,6 +52,8 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c)
return
0
;
}
/* XXX: make sure to update the copies in the different encoders if you change
* this table */
const
int
avpriv_mpeg4audio_sample_rates
[
16
]
=
{
96000
,
88200
,
64000
,
48000
,
44100
,
32000
,
24000
,
22050
,
16000
,
12000
,
11025
,
8000
,
7350
...
...
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