aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-01-01 17:14:46 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2016-01-01 17:14:46 +0100
commit5c06fc4bd88eddb8f8d4fef689fb48d006486dd2 (patch)
treef85fed0f469c51f685f85c4f5af12220ad74a2bf
parent95daa9e09aeccf6ccef4b5c08097f6b5b581de15 (diff)
parent2d0432d918a71468419b7ac1e543ab3b399d3d37 (diff)
downloadffmpeg-5c06fc4bd88eddb8f8d4fef689fb48d006486dd2.tar.gz
Merge commit '2d0432d918a71468419b7ac1e543ab3b399d3d37'
* commit '2d0432d918a71468419b7ac1e543ab3b399d3d37': vocdec: put the code not shared with other demuxers under appropriate ifdef Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r--libavformat/vocdec.c77
1 files changed, 39 insertions, 38 deletions
diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c
index c49ed163cb..70fa009814 100644
--- a/libavformat/vocdec.c
+++ b/libavformat/vocdec.c
@@ -23,44 +23,6 @@
#include "voc.h"
#include "internal.h"
-
-static int voc_probe(AVProbeData *p)
-{
- int version, check;
-
- if (memcmp(p->buf, ff_voc_magic, sizeof(ff_voc_magic) - 1))
- return 0;
- version = AV_RL16(p->buf + 22);
- check = AV_RL16(p->buf + 24);
- if (~version + 0x1234 != check)
- return 10;
-
- return AVPROBE_SCORE_MAX;
-}
-
-static int voc_read_header(AVFormatContext *s)
-{
- VocDecContext *voc = s->priv_data;
- AVIOContext *pb = s->pb;
- int header_size;
- AVStream *st;
-
- avio_skip(pb, 20);
- header_size = avio_rl16(pb) - 22;
- if (header_size != 4) {
- av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size);
- return AVERROR(ENOSYS);
- }
- avio_skip(pb, header_size);
- st = avformat_new_stream(s, NULL);
- if (!st)
- return AVERROR(ENOMEM);
- st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-
- voc->remaining_size = 0;
- return 0;
-}
-
int
ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
{
@@ -178,6 +140,44 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
return ret;
}
+#if CONFIG_VOC_DEMUXER
+static int voc_probe(AVProbeData *p)
+{
+ int version, check;
+
+ if (memcmp(p->buf, ff_voc_magic, sizeof(ff_voc_magic) - 1))
+ return 0;
+ version = AV_RL16(p->buf + 22);
+ check = AV_RL16(p->buf + 24);
+ if (~version + 0x1234 != check)
+ return 10;
+
+ return AVPROBE_SCORE_MAX;
+}
+
+static int voc_read_header(AVFormatContext *s)
+{
+ VocDecContext *voc = s->priv_data;
+ AVIOContext *pb = s->pb;
+ int header_size;
+ AVStream *st;
+
+ avio_skip(pb, 20);
+ header_size = avio_rl16(pb) - 22;
+ if (header_size != 4) {
+ av_log(s, AV_LOG_ERROR, "unknown header size: %d\n", header_size);
+ return AVERROR(ENOSYS);
+ }
+ avio_skip(pb, header_size);
+ st = avformat_new_stream(s, NULL);
+ if (!st)
+ return AVERROR(ENOMEM);
+ st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+
+ voc->remaining_size = 0;
+ return 0;
+}
+
static int voc_read_packet(AVFormatContext *s, AVPacket *pkt)
{
return ff_voc_get_packet(s, pkt, s->streams[0], 0);
@@ -215,3 +215,4 @@ AVInputFormat ff_voc_demuxer = {
.read_seek = voc_read_seek,
.codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
};
+#endif /* CONFIG_VOC_DEMUXER */