X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Foma.c;h=7282d464aa1669f3ea29fa0ead9e40bfe6ac2ffb;hb=0bf3a7361d17d596a5044882098f56817db0e103;hp=f7ae3c994889317ff29550413db357362e35518f;hpb=3e076faf3b86bb16f746e7c9b0cf3dac5f9a851a;p=ffmpeg

diff --git a/libavformat/oma.c b/libavformat/oma.c
index f7ae3c99488..7282d464aa1 100644
--- a/libavformat/oma.c
+++ b/libavformat/oma.c
@@ -18,10 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <stddef.h>
+#include "libavcodec/codec_id.h"
 #include "internal.h"
 #include "oma.h"
-#include "libavcodec/avcodec.h"
-#include "libavutil/channel_layout.h"
 
 const uint16_t ff_oma_srate_tab[8] = { 320, 441, 480, 882, 960, 0 };
 
@@ -35,16 +35,4 @@ const AVCodecTag ff_oma_codec_tags[] = {
     { 0 },
 };
 
-/** map ATRAC-X channel id to internal channel layout */
-const uint64_t ff_oma_chid_to_native_layout[7] = {
-    AV_CH_LAYOUT_MONO,
-    AV_CH_LAYOUT_STEREO,
-    AV_CH_LAYOUT_SURROUND,
-    AV_CH_LAYOUT_4POINT0,
-    AV_CH_LAYOUT_5POINT1_BACK,
-    AV_CH_LAYOUT_6POINT1_BACK,
-    AV_CH_LAYOUT_7POINT1
-};
-
-/** map ATRAC-X channel id to total number of channels */
-const int ff_oma_chid_to_num_channels[7] = {1, 2, 3, 4, 6, 7, 8};
+const AVCodecTag *const ff_oma_codec_tags_list[] = { ff_oma_codec_tags, NULL };