summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-10 15:42:10 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2021-02-23 10:14:26 +0100
commit20ff7b1f1649e0661d6e69afc138452be68995e2 (patch)
tree121fb8819a29c99b9eaa4dd7fbe6abe11cc864d4 /libavformat
parentbb9167dbde63d3616fdb37b2d5a16794abdc6692 (diff)
avformat/isom: Remove outcommented function
There is another ff_mov_read_chan in mov_chan.c. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/isom.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index e0e50f71b1..df98779149 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -418,45 +418,6 @@ static const MovChannelLayout mov_channel_layout[] = {
{ AV_CH_LAYOUT_4POINT0|AV_CH_LOW_FREQUENCY, (137<<16) | 5}, // kCAFChannelLayoutTag_DVD_11
{ 0, 0},
};
-#if 0
-int ff_mov_read_chan(AVFormatContext *s, AVStream *st, int64_t size)
-{
- AVCodecContext *codec= st->codec;
- uint32_t layout_tag;
- AVIOContext *pb = s->pb;
- const MovChannelLayout *layouts = mov_channel_layout;
-
- if (size < 12)
- return AVERROR_INVALIDDATA;
-
- layout_tag = avio_rb32(pb);
- size -= 4;
- if (layout_tag == 0) { // kCAFChannelLayoutTag_UseChannelDescriptions
- // Channel descriptions not implemented
- av_log_ask_for_sample(s, "Unimplemented container channel layout.\n");
- avio_skip(pb, size);
- return 0;
- }
- if (layout_tag == 0x10000) { // kCAFChannelLayoutTag_UseChannelBitmap
- codec->channel_layout = avio_rb32(pb);
- size -= 4;
- avio_skip(pb, size);
- return 0;
- }
- while (layouts->channel_layout) {
- if (layout_tag == layouts->layout_tag) {
- codec->channel_layout = layouts->channel_layout;
- break;
- }
- layouts++;
- }
- if (!codec->channel_layout)
- av_log(s, AV_LOG_WARNING, "Unknown container channel layout.\n");
- avio_skip(pb, size);
-
- return 0;
-}
-#endif
void ff_mov_write_chan(AVIOContext *pb, int64_t channel_layout)
{