diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-29 22:09:59 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 22:19:04 +0100 |
| commit | 36e61e24e7ac737b38c4382d439329352d9e0c29 (patch) | |
| tree | a3a478a143dcbb3d4d386fabfa1513487543c438 /libavformat/subviewerdec.c | |
| parent | e911f4ae720afe4a090ded2b165647734f0320ef (diff) | |
lavc: add ff_bprint_to_extradata() helper and use it.
This commit also makes sure the extradata and subtitle_header are NUL
terminated, without taking into account the trailing '\0' in account in
the size.
At the same time, it should fix 'warning: dereferencing type-punned
pointer will break strict-aliasing rules' warning for compilers who
don't consider uint8_t** and char** compatibles.
Diffstat (limited to 'libavformat/subviewerdec.c')
| -rw-r--r-- | libavformat/subviewerdec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c index 7691d82768..8ecc928817 100644 --- a/libavformat/subviewerdec.c +++ b/libavformat/subviewerdec.c @@ -27,6 +27,7 @@ #include "avformat.h" #include "internal.h" #include "subtitles.h" +#include "libavcodec/internal.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" #include "libavutil/intreadwrite.h" @@ -99,12 +100,9 @@ static int subviewer_read_header(AVFormatContext *s) av_bprintf(&header, "%s", line); if (!strncmp(line, "[END INFORMATION]", 17) || !strncmp(line, "[SUBTITLE]", 10)) { /* end of header */ - av_bprint_finalize(&header, (char **)&st->codec->extradata); - if (!st->codec->extradata) { - res = AVERROR(ENOMEM); + res = ff_bprint_to_extradata(st->codec, &header); + if (res < 0) goto end; - } - st->codec->extradata_size = header.len + 1; } else if (strncmp(line, "[INFORMATION]", 13)) { /* assume file metadata at this point */ int i, j = 0; |