diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:15:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-03 22:19:46 +0100 |
| commit | a83e0639c0ce779d6469208cb1cfbb934064be27 (patch) | |
| tree | e1bd7f81007997fb1038ace5a6e5bd2b3a03c0b3 /libavformat | |
| parent | deeba777ad0a0db018b1f93af32c5525a3a6a3a8 (diff) | |
| parent | e3528d2a7bf29ba148d7ac1678552ce0089cd14f (diff) | |
Merge commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f'
* commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f':
mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom
Conflicts:
libavformat/mov.c
See: b76bc010343b0cff8717cc7ee81e47273272336c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 050857cf8a..e5dd1bd3fa 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -556,7 +556,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) AVStream *st; uint32_t type; uint32_t av_unused ctype; - int title_size; + int64_t title_size; char *title_str; if (c->fc->nb_streams < 1) // meta before first trak @@ -594,9 +594,10 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR(ENOMEM); avio_read(pb, title_str, title_size); title_str[title_size] = 0; - if (title_str[0]) - av_dict_set(&st->metadata, "handler_name", title_str + - (!c->isom && title_str[0] == title_size - 1), 0); + if (title_str[0]) { + int off = (!c->isom && title_str[0] == title_size - 1); + av_dict_set(&st->metadata, "handler_name", title_str + off, 0); + } av_freep(&title_str); } |