aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-04-13 16:59:38 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-04-13 16:59:38 +0000
commitfb53b4a035c3682f5a8ab4241bde797ced539945 (patch)
tree18322fdb724ea3ad2cd1e4927e0354bf38de7907 /libavformat
parent084c7cc54a60e05ee240354d8013f512dac04ad2 (diff)
downloadffmpeg-fb53b4a035c3682f5a8ab4241bde797ced539945.tar.gz
Rename pbBufPtr() to put_bits_ptr().
The new name is more readable and consistent with the FFmpeg naming style. Originally committed as revision 18497 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/gif.c6
-rw-r--r--libavformat/mpegenc.c4
-rw-r--r--libavformat/swfenc.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/gif.c b/libavformat/gif.c
index 7ac9499577..2b802a9dca 100644
--- a/libavformat/gif.c
+++ b/libavformat/gif.c
@@ -232,9 +232,9 @@ static int gif_image_write_image(ByteIOContext *pb,
put_bits(&p, 9, 0x101); /* end of stream */
flush_put_bits(&p);
}
- if(pbBufPtr(&p) - p.buf > 0) {
- put_byte(pb, pbBufPtr(&p) - p.buf); /* byte count of the packet */
- put_buffer(pb, p.buf, pbBufPtr(&p) - p.buf); /* the actual buffer */
+ if(put_bits_ptr(&p) - p.buf > 0) {
+ put_byte(pb, put_bits_ptr(&p) - p.buf); /* byte count of the packet */
+ put_buffer(pb, p.buf, put_bits_ptr(&p) - p.buf); /* the actual buffer */
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
}
left-=GIF_CHUNKS;
diff --git a/libavformat/mpegenc.c b/libavformat/mpegenc.c
index 11a2deb033..8665030421 100644
--- a/libavformat/mpegenc.c
+++ b/libavformat/mpegenc.c
@@ -114,7 +114,7 @@ static int put_pack_header(AVFormatContext *ctx,
put_bits(&pb, 3, 0); /* stuffing length */
}
flush_put_bits(&pb);
- return pbBufPtr(&pb) - pb.buf;
+ return put_bits_ptr(&pb) - pb.buf;
}
static int put_system_header(AVFormatContext *ctx, uint8_t *buf,int only_for_stream_id)
@@ -256,7 +256,7 @@ static int put_system_header(AVFormatContext *ctx, uint8_t *buf,int only_for_str
}
flush_put_bits(&pb);
- size = pbBufPtr(&pb) - pb.buf;
+ size = put_bits_ptr(&pb) - pb.buf;
/* patch packet size */
buf[4] = (size - 6) >> 8;
buf[5] = (size - 6) & 0xff;
diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c
index a8556c85e4..af5da4ab3f 100644
--- a/libavformat/swfenc.c
+++ b/libavformat/swfenc.c
@@ -102,7 +102,7 @@ static void put_swf_rect(ByteIOContext *pb,
put_bits(&p, nbits, ymax & mask);
flush_put_bits(&p);
- put_buffer(pb, buf, pbBufPtr(&p) - p.buf);
+ put_buffer(pb, buf, put_bits_ptr(&p) - p.buf);
}
static void put_swf_line_edge(PutBitContext *pb, int dx, int dy)
@@ -167,7 +167,7 @@ static void put_swf_matrix(ByteIOContext *pb,
put_bits(&p, nbits, ty);
flush_put_bits(&p);
- put_buffer(pb, buf, pbBufPtr(&p) - p.buf);
+ put_buffer(pb, buf, put_bits_ptr(&p) - p.buf);
}
static int swf_write_header(AVFormatContext *s)
@@ -293,7 +293,7 @@ static int swf_write_header(AVFormatContext *s)
put_bits(&p, 5, 0);
flush_put_bits(&p);
- put_buffer(pb, buf1, pbBufPtr(&p) - p.buf);
+ put_buffer(pb, buf1, put_bits_ptr(&p) - p.buf);
put_swf_end_tag(s);
}