avio: rename av_alloc_put_byte -> avio_alloc_context for consistency

Signed-off-by: Ronald S. Bultje <[email protected]> (cherry picked from commit 8d9ac96)
SaschaVasarrhelyi · Feb 22, 2011 · 90ed277 · 90ed277
1 parent 34bb057
commit 90ed277
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
@@ -752,7 +752,7 @@ static int read_gab2_sub(AVStream *st, AVPacket *pkt) {
         AVIStream *ast = st->priv_data;
         AVInputFormat *sub_demuxer;
         AVRational time_base;
-        AVIOContext *pb = av_alloc_put_byte(pkt->data + 7,
+        AVIOContext *pb = avio_alloc_context( pkt->data + 7,
                                               pkt->size - 7,
                                               0, NULL, NULL, NULL, NULL);
         AVProbeData pd;

diff --git a/libavformat/avio.h b/libavformat/avio.h
@@ -370,8 +370,17 @@ attribute_deprecated int init_put_byte(AVIOContext *s,
                   int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
                   int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
                   int64_t (*seek)(void *opaque, int64_t offset, int whence));
+attribute_deprecated AVIOContext *av_alloc_put_byte(
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence));
 #endif
-AVIOContext *av_alloc_put_byte(
+
+AVIOContext *avio_alloc_context(
                   unsigned char *buffer,
                   int buffer_size,
                   int write_flag,

diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
@@ -87,9 +87,21 @@ int init_put_byte(AVIOContext *s,
     return ffio_init_context(s, buffer, buffer_size, write_flag, opaque,
                                 read_packet, write_packet, seek);
 }
+AVIOContext *av_alloc_put_byte(
+                  unsigned char *buffer,
+                  int buffer_size,
+                  int write_flag,
+                  void *opaque,
+                  int (*read_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int (*write_packet)(void *opaque, uint8_t *buf, int buf_size),
+                  int64_t (*seek)(void *opaque, int64_t offset, int whence))
+{
+    return avio_alloc_context(buffer, buffer_size, write_flag, opaque,
+                              read_packet, write_packet, seek);
+}
 #endif
 
-AVIOContext *av_alloc_put_byte(
+AVIOContext *avio_alloc_context(
                   unsigned char *buffer,
                   int buffer_size,
                   int write_flag,

diff --git a/libavformat/rdt.c b/libavformat/rdt.c
@@ -311,7 +311,7 @@ rdt_parse_packet (AVFormatContext *ctx, PayloadContext *rdt, AVStream *st,
         if (res > 0) {
             if (st->codec->codec_id == CODEC_ID_AAC) {
                 memcpy (rdt->buffer, buf + pos, len - pos);
-                rdt->rmctx->pb = av_alloc_put_byte (rdt->buffer, len - pos, 0,
+                rdt->rmctx->pb = avio_alloc_context (rdt->buffer, len - pos, 0,
                                                     NULL, NULL, NULL, NULL);
             }
             goto get_cache;

diff --git a/libavformat/wtv.c b/libavformat/wtv.c
@@ -236,7 +236,7 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int
         return NULL;
     }
 
-    pb = av_alloc_put_byte(buffer, 1 << wf->sector_bits, 0, wf,
+    pb = avio_alloc_context(buffer, 1 << wf->sector_bits, 0, wf,
                            wtvfile_read_packet, NULL, wtvfile_seek);
     if (!pb) {
         av_free(buffer);