virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f'

Browse Source 
* commit 'e3528d2a7bf29ba148d7ac1678552ce0089cd14f':
  mov: Implement parsing of the "HandlerName" from the MP4 HDLR atom

Conflicts:
	libavformat/mov.c

See: b76bc01034
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-02-03 22:15:54 +01:00
parent deeba777ad e3528d2a7b
commit a83e0639c0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/mov.c
View File

@@ -556,7 +556,7 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
AVStream *st; AVStream *st;
uint32_t type; uint32_t type;
uint32_t av_unused ctype; uint32_t av_unused ctype;
int title_size; int64_t title_size;
char *title_str; char *title_str;
if (c->fc->nb_streams < 1) // meta before first trak 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); return AVERROR(ENOMEM);
avio_read(pb, title_str, title_size); avio_read(pb, title_str, title_size);
title_str[title_size] = 0; title_str[title_size] = 0;
if (title_str[0]) if (title_str[0]) {
av_dict_set(&st->metadata, "handler_name", title_str + int off = (!c->isom && title_str[0] == title_size - 1);
(!c->isom && title_str[0] == title_size - 1), 0); av_dict_set(&st->metadata, "handler_name", title_str + off, 0);
}
av_freep(&title_str); av_freep(&title_str);
} }