diff options
| author | Carl Eugen Hoyos | 2020-02-11 00:20:52 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos | 2020-04-04 23:12:27 +0200 |
| commit | 4679a474f06c229b10976d7f0b4eee0613c2715a (patch) | |
| tree | ee7736091903d8e8027eae94436cfdc6e1874f01 | |
| parent | 944cb188edda3574d52a161d785928c851810cef (diff) | |
lavc: Use supported_samplerates for Dolby Digital encoders.
Fixes ticket #8518.
| -rw-r--r-- | libavcodec/ac3enc_fixed.c | 1 | ||||
| -rw-r--r-- | libavcodec/ac3enc_float.c | 1 | ||||
| -rw-r--r-- | libavcodec/ac3tab.c | 2 | ||||
| -rw-r--r-- | libavcodec/ac3tab.h | 2 | ||||
| -rw-r--r-- | libavcodec/eac3enc.c | 1 |
5 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/ac3enc_fixed.c b/libavcodec/ac3enc_fixed.c index b23fc64776..e57d035294 100644 --- a/libavcodec/ac3enc_fixed.c +++ b/libavcodec/ac3enc_fixed.c @@ -155,6 +155,7 @@ AVCodec ff_ac3_fixed_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16P, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3enc_class, + .supported_samplerates = ff_ac3_sample_rate_tab, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; diff --git a/libavcodec/ac3enc_float.c b/libavcodec/ac3enc_float.c index d6e658b2b4..1f3111af0e 100644 --- a/libavcodec/ac3enc_float.c +++ b/libavcodec/ac3enc_float.c @@ -150,6 +150,7 @@ AVCodec ff_ac3_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &ac3enc_class, + .supported_samplerates = ff_ac3_sample_rate_tab, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index bd88f32d92..96ef8ebaeb 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -126,7 +126,7 @@ const uint8_t ff_ac3_dec_channel_map[8][2][6] = { }; /* possible frequencies */ -const uint16_t ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 }; +const int ff_ac3_sample_rate_tab[3] = { 48000, 44100, 32000 }; /* possible bitrates */ const uint16_t ff_ac3_bitrate_tab[19] = { diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index aa71acbce1..f0f6e6ccc4 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -33,7 +33,7 @@ extern const uint8_t ff_ac3_channels_tab[8]; extern av_export_avcodec const uint16_t avpriv_ac3_channel_layout_tab[8]; extern const uint8_t ff_ac3_enc_channel_map[8][2][6]; extern const uint8_t ff_ac3_dec_channel_map[8][2][6]; -extern const uint16_t ff_ac3_sample_rate_tab[3]; +extern const int ff_ac3_sample_rate_tab[3]; extern const uint16_t ff_ac3_bitrate_tab[19]; extern const uint8_t ff_ac3_rematrix_band_tab[5]; extern const uint8_t ff_eac3_default_cpl_band_struct[18]; diff --git a/libavcodec/eac3enc.c b/libavcodec/eac3enc.c index e1d61f68bf..6a90571e56 100644 --- a/libavcodec/eac3enc.c +++ b/libavcodec/eac3enc.c @@ -263,6 +263,7 @@ AVCodec ff_eac3_encoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, .priv_class = &eac3enc_class, + .supported_samplerates = ff_ac3_sample_rate_tab, .channel_layouts = ff_ac3_channel_layouts, .defaults = ac3_defaults, }; |