aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-01-02 09:31:07 +0100
committerClément Bœsch <ubitux@gmail.com>2013-01-02 09:31:07 +0100
commit5a2f3f0bca5ae72b4faa4d64b967de71046d46d5 (patch)
tree849e40835325395fab3681be0bdb1df15721d10b
parent1e28fa21de232ba4f37c23eb052465fc07bc1507 (diff)
downloadffmpeg-5a2f3f0bca5ae72b4faa4d64b967de71046d46d5.tar.gz
lavf/vobsub: do not count trailing NUL char in extradata.
See 36e61e24.
-rw-r--r--libavformat/mpeg.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c
index afa8618a60..cc2fe7f495 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -597,7 +597,7 @@ static int vobsub_probe(AVProbeData *p)
static int vobsub_read_header(AVFormatContext *s)
{
- int i, header_size, ret = 0, header_parsed = 0, langidx = 0;
+ int i, ret = 0, header_parsed = 0, langidx = 0;
MpegDemuxContext *vobsub = s->priv_data;
char *sub_name = NULL;
size_t fname_len;
@@ -726,11 +726,10 @@ static int vobsub_read_header(AVFormatContext *s)
goto end;
}
av_bprint_finalize(&header, &header_str);
- header_size = header.len + 1;
for (i = 0; i < s->nb_streams; i++) {
AVStream *sub_st = s->streams[i];
sub_st->codec->extradata = av_strdup(header_str);
- sub_st->codec->extradata_size = header_size;
+ sub_st->codec->extradata_size = header.len;
}
av_free(header_str);