diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-03-14 20:38:57 +0100 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-03-16 22:59:38 -0400 |
| commit | 4839c192de7782605e1b7c9cc84aaf692cf67284 (patch) | |
| tree | e40c8ff6bafe53ff7052cd74a6050f0cda7dd60a /libavformat/mpc8.c | |
| parent | 073f8b10d8d7638fcee33aba04ca2a7b90bdb2c3 (diff) | |
| download | ffmpeg-4839c192de7782605e1b7c9cc84aaf692cf67284.tar.gz | |
lavf: move ff_get_v from avio.h to avio_internal.h
And rename it to ffio_read_varlen.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/mpc8.c')
| -rw-r--r-- | libavformat/mpc8.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c index 00217fa2ab..8b2d395621 100644 --- a/libavformat/mpc8.c +++ b/libavformat/mpc8.c @@ -22,6 +22,7 @@ #include "libavcodec/get_bits.h" #include "libavcodec/unary.h" #include "avformat.h" +#include "avio_internal.h" /// Two-byte MPC tag #define MKMPCTAG(a, b) (a | (b << 8)) @@ -122,7 +123,7 @@ static void mpc8_get_chunk_header(AVIOContext *pb, int *tag, int64_t *size) int64_t pos; pos = avio_tell(pb); *tag = avio_rl16(pb); - *size = ff_get_v(pb); + *size = ffio_read_varlen(pb); *size -= avio_tell(pb) - pos; } @@ -177,7 +178,7 @@ static void mpc8_handle_chunk(AVFormatContext *s, int tag, int64_t chunk_pos, in switch(tag){ case TAG_SEEKTBLOFF: pos = avio_tell(pb) + size; - off = ff_get_v(pb); + off = ffio_read_varlen(pb); mpc8_parse_seektable(s, chunk_pos + off); avio_seek(pb, pos, SEEK_SET); break; @@ -218,8 +219,8 @@ static int mpc8_read_header(AVFormatContext *s, AVFormatParameters *ap) av_log(s, AV_LOG_ERROR, "Unknown stream version %d\n", c->ver); return -1; } - c->samples = ff_get_v(pb); - ff_get_v(pb); //silence samples at the beginning + c->samples = ffio_read_varlen(pb); + ffio_read_varlen(pb); //silence samples at the beginning st = av_new_stream(s, 0); if (!st) |