diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-18 12:57:16 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-28 09:38:45 +0200 |
| commit | 79508ee5231f66fa8333311da3725fe53f2dafea (patch) | |
| tree | db2cab26f2fa06ba85d67d31b6724bda9905755c /libavcodec/metasound.c | |
| parent | 6856cabd1386dbd8d5e99ae39042a826b6b141ad (diff) | |
avcodec/metasound_data: Include data into metasound.c directly
It is only used by metasound.c, so this allows to make
the data static.
To do this, remove metasound_data.h, rename metasound_data.c
into metasound_data.h (and add inclusion guards, remove ff_
prefixes etc.).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/metasound.c')
| -rw-r--r-- | libavcodec/metasound.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libavcodec/metasound.c b/libavcodec/metasound.c index 7ddf992c09..f332316831 100644 --- a/libavcodec/metasound.c +++ b/libavcodec/metasound.c @@ -305,46 +305,46 @@ static av_cold int metasound_decode_init(AVCodecContext *avctx) switch ((channels << 16) + (isampf << 8) + ibps) { case (1 << 16) + ( 8 << 8) + 6: - tctx->mtab = &ff_metasound_mode0806; + tctx->mtab = &metasound_mode0806; break; case (2 << 16) + ( 8 << 8) + 6: - tctx->mtab = &ff_metasound_mode0806s; + tctx->mtab = &metasound_mode0806s; break; case (1 << 16) + ( 8 << 8) + 8: - tctx->mtab = &ff_metasound_mode0808; + tctx->mtab = &metasound_mode0808; break; case (2 << 16) + ( 8 << 8) + 8: - tctx->mtab = &ff_metasound_mode0808s; + tctx->mtab = &metasound_mode0808s; break; case (1 << 16) + (11 << 8) + 10: - tctx->mtab = &ff_metasound_mode1110; + tctx->mtab = &metasound_mode1110; break; case (2 << 16) + (11 << 8) + 10: - tctx->mtab = &ff_metasound_mode1110s; + tctx->mtab = &metasound_mode1110s; break; case (1 << 16) + (16 << 8) + 16: - tctx->mtab = &ff_metasound_mode1616; + tctx->mtab = &metasound_mode1616; break; case (2 << 16) + (16 << 8) + 16: - tctx->mtab = &ff_metasound_mode1616s; + tctx->mtab = &metasound_mode1616s; break; case (1 << 16) + (22 << 8) + 24: - tctx->mtab = &ff_metasound_mode2224; + tctx->mtab = &metasound_mode2224; break; case (2 << 16) + (22 << 8) + 24: - tctx->mtab = &ff_metasound_mode2224s; + tctx->mtab = &metasound_mode2224s; break; case (1 << 16) + (44 << 8) + 32: case (2 << 16) + (44 << 8) + 32: - tctx->mtab = &ff_metasound_mode4432; + tctx->mtab = &metasound_mode4432; break; case (1 << 16) + (44 << 8) + 40: case (2 << 16) + (44 << 8) + 40: - tctx->mtab = &ff_metasound_mode4440; + tctx->mtab = &metasound_mode4440; break; case (1 << 16) + (44 << 8) + 48: case (2 << 16) + (44 << 8) + 48: - tctx->mtab = &ff_metasound_mode4448; + tctx->mtab = &metasound_mode4448; break; default: av_log(avctx, AV_LOG_ERROR, |