diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-18 02:01:09 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-23 11:26:21 +0100 |
| commit | 22d8010f13cb6209d1de591ddc6d4083a0cd646d (patch) | |
| tree | 6f03201ce11c7b8c751c2ab60707cdc05955c0a5 /libavformat/oma.c | |
| parent | 81a86c7e1ecf70ae63565ff86699959686753a2d (diff) | |
| download | ffmpeg-22d8010f13cb6209d1de591ddc6d4083a0cd646d.tar.gz | |
avformat/oma: Move stuff only used by demuxer to demuxer
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat/oma.c')
| -rw-r--r-- | libavformat/oma.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/libavformat/oma.c b/libavformat/oma.c index e7bf8553f0..7282d464aa 100644 --- a/libavformat/oma.c +++ b/libavformat/oma.c @@ -19,10 +19,9 @@ */ #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 }; @@ -37,17 +36,3 @@ const AVCodecTag ff_oma_codec_tags[] = { }; const AVCodecTag *const ff_oma_codec_tags_list[] = { ff_oma_codec_tags, NULL }; - -/** 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}; |