diff options
| author | Björn Axelsson <gecko@acc.umu.se> | 2007-11-21 07:41:00 +0000 |
|---|---|---|
| committer | Andreas Öman <andreas@lonelycoder.com> | 2007-11-21 07:41:00 +0000 |
| commit | 899681cd1dbf4cd7c3b86af23bca25e20a54f4d0 (patch) | |
| tree | 6f4556497efab1d703d1289b170c936154c6bbd5 /libavformat/txd.c | |
| parent | 79815f622d90499f882ad968a1351134535cbbab (diff) | |
| download | ffmpeg-899681cd1dbf4cd7c3b86af23bca25e20a54f4d0.tar.gz | |
Use dynamically allocated ByteIOContext in AVFormatContext
patch by: Björn Axelsson, bjorn d axelsson a intinor d se
thread: [PATCH] Remove static ByteIOContexts, 06 nov 2007
Originally committed as revision 11071 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/txd.c')
| -rw-r--r-- | libavformat/txd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/txd.c b/libavformat/txd.c index 6c17dff55a..8092a41a48 100644 --- a/libavformat/txd.c +++ b/libavformat/txd.c @@ -51,7 +51,7 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) { } static int txd_read_packet(AVFormatContext *s, AVPacket *pkt) { - ByteIOContext *pb = &s->pb; + ByteIOContext *pb = s->pb; unsigned int id, chunk_size, marker; int ret; @@ -60,7 +60,7 @@ next_chunk: chunk_size = get_le32(pb); marker = get_le32(pb); - if (url_feof(&s->pb)) + if (url_feof(s->pb)) return AVERROR(EIO); if (marker != TXD_MARKER && marker != TXD_MARKER2) { av_log(NULL, AV_LOG_ERROR, "marker does not match\n"); @@ -72,7 +72,7 @@ next_chunk: if (chunk_size > 100) break; case TXD_EXTRA: - url_fskip(&s->pb, chunk_size); + url_fskip(s->pb, chunk_size); case TXD_FILE: case TXD_TEXTURE: goto next_chunk; @@ -81,7 +81,7 @@ next_chunk: return AVERROR(EIO); } - ret = av_get_packet(&s->pb, pkt, chunk_size); + ret = av_get_packet(s->pb, pkt, chunk_size); pkt->stream_index = 0; return ret <= 0 ? AVERROR(EIO) : ret; |