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/samidec.c | |
| parent | e911f4ae720afe4a090ded2b165647734f0320ef (diff) | |
| download | ffmpeg-36e61e24e7ac737b38c4382d439329352d9e0c29.tar.gz | |
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/samidec.c')
| -rw-r--r-- | libavformat/samidec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavformat/samidec.c b/libavformat/samidec.c index 85fd220f4a..bdde2f466f 100644 --- a/libavformat/samidec.c +++ b/libavformat/samidec.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" @@ -91,13 +92,9 @@ static int sami_read_header(AVFormatContext *s) av_bprint_clear(&buf); } - st->codec->extradata_size = hdr_buf.len + 1; - av_bprint_finalize(&hdr_buf, (char **)&st->codec->extradata); - if (!st->codec->extradata) { - st->codec->extradata_size = 0; - res = AVERROR(ENOMEM); + res = ff_bprint_to_extradata(st->codec, &hdr_buf); + if (res < 0) goto end; - } ff_subtitles_queue_finalize(&sami->q); |