summaryrefslogtreecommitdiff
path: root/libavformat/matroskadec.c
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:41:07 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-08-05 00:41:07 +0000
commit3143f13345e4a206dc03491255116a1eb8119ae0 (patch)
treeb19567e712abfdfaca9e1d1a47edc60300d09970 /libavformat/matroskadec.c
parent209472b45d39824fa4f418e5652e801e8f69f6aa (diff)
matroskadec: remove some unused ebml funcs
Originally committed as revision 14574 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c52
1 files changed, 0 insertions, 52 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 3bf13bf4f6..ea3d8c4632 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -689,45 +689,6 @@ ebml_read_uint (MatroskaDemuxContext *matroska,
}
/*
- * Read the next element as a signed int.
- * 0 is success, < 0 is failure.
- */
-
-static int
-ebml_read_sint (MatroskaDemuxContext *matroska,
- uint32_t *id,
- int64_t *num)
-{
- ByteIOContext *pb = matroska->ctx->pb;
- int size, n = 1, negative = 0, res;
- uint64_t rlength;
-
- if ((res = ebml_read_element_id(matroska, id, NULL)) < 0 ||
- (res = ebml_read_element_length(matroska, &rlength)) < 0)
- return res;
- size = rlength;
- if (size < 1 || size > 8) {
- offset_t pos = url_ftell(pb);
- av_log(matroska->ctx, AV_LOG_ERROR,
- "Invalid sint element size %d at position %"PRId64" (0x%"PRIx64")\n",
- size, pos, pos);
- return AVERROR_INVALIDDATA;
- }
- if ((*num = get_byte(pb)) & 0x80) {
- negative = 1;
- *num &= ~0x80;
- }
- while (n++ < size)
- *num = (*num << 8) | get_byte(pb);
-
- /* make signed */
- if (negative)
- *num = *num - (1LL << ((8 * size) - 1));
-
- return 0;
-}
-
-/*
* Read the next element as a float.
* 0 is success, < 0 is failure.
*/
@@ -799,19 +760,6 @@ ebml_read_ascii (MatroskaDemuxContext *matroska,
}
/*
- * Read the next element as a UTF-8 string.
- * 0 is success, < 0 is failure.
- */
-
-static int
-ebml_read_utf8 (MatroskaDemuxContext *matroska,
- uint32_t *id,
- char **str)
-{
- return ebml_read_ascii(matroska, id, str);
-}
-
-/*
* Read the next element, but only the header. The contents
* are supposed to be sub-elements which can be read separately.
* 0 is success, < 0 is failure.