summaryrefslogtreecommitdiff
path: root/libavformat/mov.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2017-03-14 16:43:29 +0100
committerDiego Biurrun <diego@biurrun.de>2017-04-03 13:50:00 +0200
commit604fbb3132e88727e496c96c92cfe02748c25a1a (patch)
tree2b15eb916a4430e87dc74c03ba47a62c628c4fc2 /libavformat/mov.c
parent3d197514e613ccd9eab43180c0a7c8b09a307606 (diff)
mov: Move code shared with CAF to a separate file
Diffstat (limited to 'libavformat/mov.c')
-rw-r--r--libavformat/mov.c36
1 files changed, 0 insertions, 36 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1c1857eaf9..bf68fbd46a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -674,28 +674,6 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
}
-int ff_mov_read_esds(AVFormatContext *fc, AVIOContext *pb)
-{
- AVStream *st;
- int tag;
-
- if (fc->nb_streams < 1)
- return 0;
- st = fc->streams[fc->nb_streams-1];
-
- avio_rb32(pb); /* version + flags */
- ff_mp4_read_descr(fc, pb, &tag);
- if (tag == MP4ESDescrTag) {
- ff_mp4_parse_es_descr(pb, NULL);
- } else
- avio_rb16(pb); /* ID */
-
- ff_mp4_read_descr(fc, pb, &tag);
- if (tag == MP4DecConfigDescrTag)
- ff_mp4_read_dec_config_descr(fc, st, pb);
- return 0;
-}
-
static int mov_read_esds(MOVContext *c, AVIOContext *pb, MOVAtom atom)
{
return ff_mov_read_esds(c->fc, pb);
@@ -1377,20 +1355,6 @@ static int mov_read_stco(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
}
-/**
- * Compute codec id for 'lpcm' tag.
- * See CoreAudioTypes and AudioStreamBasicDescription at Apple.
- */
-enum AVCodecID ff_mov_get_lpcm_codec_id(int bps, int flags)
-{
- /* lpcm flags:
- * 0x1 = float
- * 0x2 = big-endian
- * 0x4 = signed
- */
- return ff_get_pcm_codec_id(bps, flags & 1, flags & 2, flags & 4 ? -1 : 0);
-}
-
static int mov_codec_id(AVStream *st, uint32_t format)
{
int id = ff_codec_get_id(ff_codec_movaudio_tags, format);