From 4c8d9b1d0901b0fba0887e53463574913e8862c5 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Thu, 18 Feb 2021 19:46:25 +0100 Subject: [PATCH] avcodec/ac3tab: Remove unused ff_eac3_default_chmap Added in 0c79b1402a48a99f32435a0f5ad2364c58c6fcf3 to use it in a function that was never used and was itself removed in 676f1f533e2c2960d81784188592a066b9ff1c3d. Signed-off-by: Andreas Rheinhardt --- libavcodec/ac3tab.c | 13 ------------- libavcodec/ac3tab.h | 1 - 2 files changed, 14 deletions(-) diff --git a/libavcodec/ac3tab.c b/libavcodec/ac3tab.c index 5a352340e7..e53086a754 100644 --- a/libavcodec/ac3tab.c +++ b/libavcodec/ac3tab.c @@ -245,19 +245,6 @@ const uint16_t ff_ac3_fast_gain_tab[8]= { 0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400, }; -/** - * Default channel map for a dependent substream defined by acmod - */ -const uint16_t ff_eac3_default_chmap[8] = { - AC3_CHMAP_L | AC3_CHMAP_R, // FIXME Ch1+Ch2 - AC3_CHMAP_C, - AC3_CHMAP_L | AC3_CHMAP_R, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R, - AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_C_SUR, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_C_SUR, - AC3_CHMAP_L | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR, - AC3_CHMAP_L | AC3_CHMAP_C | AC3_CHMAP_R | AC3_CHMAP_L_SUR | AC3_CHMAP_R_SUR -}; const uint64_t ff_eac3_custom_channel_map_locations[16][2] = { { 1, AV_CH_FRONT_LEFT }, { 1, AV_CH_FRONT_CENTER }, diff --git a/libavcodec/ac3tab.h b/libavcodec/ac3tab.h index f41f7b6da0..ea8e3340c7 100644 --- a/libavcodec/ac3tab.h +++ b/libavcodec/ac3tab.h @@ -45,7 +45,6 @@ extern const uint16_t ff_ac3_slow_gain_tab[4]; extern const uint16_t ff_ac3_db_per_bit_tab[4]; extern const int16_t ff_ac3_floor_tab[8]; extern const uint16_t ff_ac3_fast_gain_tab[8]; -extern const uint16_t ff_eac3_default_chmap[8]; extern const uint8_t ff_ac3_band_start_tab[AC3_CRITICAL_BANDS+1]; extern const uint8_t ff_ac3_bin_to_band_tab[253]; extern const uint64_t ff_eac3_custom_channel_map_locations[16][2]; -- GitLab