virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/rmenc: do not access AVIO write buffer directly

Browse Source 
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2017-06-16 22:45:23 +02:00
parent 099d35401c
commit 8a09325311
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/rmenc.c
View File

@@ -72,14 +72,12 @@ static int rv10_write_header(AVFormatContext *ctx,
RMMuxContext *rm = ctx->priv_data; RMMuxContext *rm = ctx->priv_data;
AVIOContext *s = ctx->pb; AVIOContext *s = ctx->pb;
StreamInfo *stream; StreamInfo *stream;
unsigned char *data_offset_ptr, *start_ptr;
const char *desc, *mimetype; const char *desc, *mimetype;
int nb_packets, packet_total_size, packet_max_size, size, packet_avg_size, i; int nb_packets, packet_total_size, packet_max_size, size, packet_avg_size, i;
int bit_rate, v, duration, flags, data_pos; int bit_rate, v, duration, flags;
int data_offset;
AVDictionaryEntry *tag; AVDictionaryEntry *tag;
start_ptr = s->buf_ptr;
ffio_wfourcc(s, ".RMF"); ffio_wfourcc(s, ".RMF");
avio_wb32(s,18); /* header size */ avio_wb32(s,18); /* header size */
avio_wb16(s,0); avio_wb16(s,0);
@@ -119,7 +117,7 @@ static int rv10_write_header(AVFormatContext *ctx,
avio_wb32(s, BUFFER_DURATION); /* preroll */ avio_wb32(s, BUFFER_DURATION); /* preroll */
avio_wb32(s, index_pos); /* index offset */ avio_wb32(s, index_pos); /* index offset */
/* computation of data the data offset */ /* computation of data the data offset */
data_offset_ptr = s->buf_ptr; data_offset = avio_tell(s);
avio_wb32(s, 0); /* data offset : will be patched after */ avio_wb32(s, 0); /* data offset : will be patched after */
avio_wb16(s, ctx->nb_streams); /* num streams */ avio_wb16(s, ctx->nb_streams); /* num streams */
flags = 1 | 2; /* save allowed & perfect play */ flags = 1 | 2; /* save allowed & perfect play */
@@ -276,12 +274,11 @@ static int rv10_write_header(AVFormatContext *ctx,
} }
/* patch data offset field */ /* patch data offset field */
data_pos = s->buf_ptr - start_ptr; rm->data_pos = avio_tell(s);
rm->data_pos = data_pos; if (avio_seek(s, data_offset, SEEK_SET) >= 0) {
data_offset_ptr[0] = data_pos >> 24; avio_wb32(s, rm->data_pos);
data_offset_ptr[1] = data_pos >> 16; avio_seek(s, rm->data_pos, SEEK_SET);
data_offset_ptr[2] = data_pos >> 8; }
data_offset_ptr[3] = data_pos;
/* data stream */ /* data stream */
ffio_wfourcc(s, "DATA"); ffio_wfourcc(s, "DATA");