diff options
author | Anton Khirnov <anton@khirnov.net> | 2011-02-21 21:28:17 +0300 |
---|---|---|
committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-21 22:25:15 +0300 |
commit | 77eb5504d3b3e1047900382350e0bc5e0bfb16b5 (patch) | |
tree | adb31feb8accd7dbaaa2ce1baf48fee96664abe1 /libavformat/ffmetaenc.c | |
parent | 78e2380a6d09e7a8b2a74d090abfb0a922e046f6 (diff) |
avio: avio: avio_ prefixes for put_* functions
In the name of consistency:
put_byte -> avio_w8
put_<type> -> avio_w<type>
put_buffer -> avio_write
put_nbyte will be made private
put_tag will be merged with avio_put_str
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavformat/ffmetaenc.c')
-rw-r--r-- | libavformat/ffmetaenc.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavformat/ffmetaenc.c b/libavformat/ffmetaenc.c index 68b22e9551..322ec0f576 100644 --- a/libavformat/ffmetaenc.c +++ b/libavformat/ffmetaenc.c @@ -31,8 +31,8 @@ static void write_escape_str(AVIOContext *s, const uint8_t *str) while (*p) { if (*p == '#' || *p == ';' || *p == '=' || *p == '\\' || *p == '\n') - put_byte(s, '\\'); - put_byte(s, *p); + avio_w8(s, '\\'); + avio_w8(s, *p); p++; } } @@ -42,17 +42,17 @@ static void write_tags(AVIOContext *s, AVMetadata *m) AVMetadataTag *t = NULL; while ((t = av_metadata_get(m, "", t, AV_METADATA_IGNORE_SUFFIX))) { write_escape_str(s, t->key); - put_byte(s, '='); + avio_w8(s, '='); write_escape_str(s, t->value); - put_byte(s, '\n'); + avio_w8(s, '\n'); } } static int write_header(AVFormatContext *s) { put_tag(s->pb, ID_STRING); - put_byte(s->pb, '1'); // version - put_byte(s->pb, '\n'); + avio_w8(s->pb, '1'); // version + avio_w8(s->pb, '\n'); put_flush_packet(s->pb); return 0; } @@ -65,14 +65,14 @@ static int write_trailer(AVFormatContext *s) for (i = 0; i < s->nb_streams; i++) { put_tag(s->pb, ID_STREAM); - put_byte(s->pb, '\n'); + avio_w8(s->pb, '\n'); write_tags(s->pb, s->streams[i]->metadata); } for (i = 0; i < s->nb_chapters; i++) { AVChapter *ch = s->chapters[i]; put_tag(s->pb, ID_CHAPTER); - put_byte(s->pb, '\n'); + avio_w8(s->pb, '\n'); url_fprintf(s->pb, "TIMEBASE=%d/%d\n", ch->time_base.num, ch->time_base.den); url_fprintf(s->pb, "START=%"PRId64"\n", ch->start); url_fprintf(s->pb, "END=%"PRId64"\n", ch->end); |