Commit 7581ad24 authored by Clément Bœsch's avatar Clément Bœsch

lavc/aac: fix shared build failures with MSVC.

This is a workaround until a better solution is found.
parent 0e239b22
...@@ -811,6 +811,13 @@ static const AVClass aacenc_class = { ...@@ -811,6 +811,13 @@ static const AVClass aacenc_class = {
LIBAVUTIL_VERSION_INT, 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 = { AVCodec ff_aac_encoder = {
.name = "aac", .name = "aac",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
...@@ -819,7 +826,7 @@ AVCodec ff_aac_encoder = { ...@@ -819,7 +826,7 @@ AVCodec ff_aac_encoder = {
.init = aac_encode_init, .init = aac_encode_init,
.encode2 = aac_encode_frame, .encode2 = aac_encode_frame,
.close = aac_encode_end, .close = aac_encode_end,
.supported_samplerates = avpriv_mpeg4audio_sample_rates, .supported_samplerates = mpeg4audio_sample_rates,
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY | .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY |
CODEC_CAP_EXPERIMENTAL, CODEC_CAP_EXPERIMENTAL,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP,
......
...@@ -185,6 +185,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, ...@@ -185,6 +185,13 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
return 0; 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 = { AVCodec ff_libvo_aacenc_encoder = {
.name = "libvo_aacenc", .name = "libvo_aacenc",
.type = AVMEDIA_TYPE_AUDIO, .type = AVMEDIA_TYPE_AUDIO,
...@@ -193,7 +200,7 @@ AVCodec ff_libvo_aacenc_encoder = { ...@@ -193,7 +200,7 @@ AVCodec ff_libvo_aacenc_encoder = {
.init = aac_encode_init, .init = aac_encode_init,
.encode2 = aac_encode_frame, .encode2 = aac_encode_frame,
.close = aac_encode_close, .close = aac_encode_close,
.supported_samplerates = avpriv_mpeg4audio_sample_rates, .supported_samplerates = mpeg4audio_sample_rates,
.capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY, .capabilities = CODEC_CAP_SMALL_LAST_FRAME | CODEC_CAP_DELAY,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
......
...@@ -52,6 +52,8 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c) ...@@ -52,6 +52,8 @@ static int parse_config_ALS(GetBitContext *gb, MPEG4AudioConfig *c)
return 0; 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] = { const int avpriv_mpeg4audio_sample_rates[16] = {
96000, 88200, 64000, 48000, 44100, 32000, 96000, 88200, 64000, 48000, 44100, 32000,
24000, 22050, 16000, 12000, 11025, 8000, 7350 24000, 22050, 16000, 12000, 11025, 8000, 7350
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment