generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

id3v2enc: make id3v2_put_size take only an AVIOContext.

Browse Source 
It has no need of full AVFormatContext.
This commit is contained in:
Anton Khirnov 2012-02-27 21:48:37 +01:00
parent 393fd0d89e
commit c199817748
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/id3v2enc.c
View File

@ -26,12 +26,12 @@
#include "avio.h" #include "avio.h"
#include "id3v2.h" #include "id3v2.h"
static void id3v2_put_size(AVFormatContext *s, int size) static void id3v2_put_size(AVIOContext *pb, int size)
{ {
avio_w8(s->pb, size >> 21 & 0x7f); avio_w8(pb, size >> 21 & 0x7f);
avio_w8(s->pb, size >> 14 & 0x7f); avio_w8(pb, size >> 14 & 0x7f);
avio_w8(s->pb, size >> 7 & 0x7f); avio_w8(pb, size >> 7 & 0x7f);
avio_w8(s->pb, size & 0x7f); avio_w8(pb, size & 0x7f);
} }
static int string_is_ascii(const uint8_t *str) static int string_is_ascii(const uint8_t *str)
@ -74,7 +74,7 @@ static int id3v2_put_ttag(AVFormatContext *s, const char *str1, const char *str2
len = avio_close_dyn_buf(dyn_buf, &pb); len = avio_close_dyn_buf(dyn_buf, &pb);
avio_wb32(s->pb, tag); avio_wb32(s->pb, tag);
id3v2_put_size(s, len); id3v2_put_size(s->pb, len);
avio_wb16(s->pb, 0); avio_wb16(s->pb, 0);
avio_write(s->pb, pb, len); avio_write(s->pb, pb, len);
@ -140,7 +140,7 @@ int ff_id3v2_write(struct AVFormatContext *s, int id3v2_version,
cur_pos = avio_tell(s->pb); cur_pos = avio_tell(s->pb);
avio_seek(s->pb, size_pos, SEEK_SET); avio_seek(s->pb, size_pos, SEEK_SET);
id3v2_put_size(s, totlen); id3v2_put_size(s->pb, totlen);
avio_seek(s->pb, cur_pos, SEEK_SET); avio_seek(s->pb, cur_pos, SEEK_SET);
return 0; return 0;
} }