RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mov: Trim dref absolute path 

Samples produced by Omneon (Harmonic) store external references with
paths ending with 0s. Such movs cannot be loaded properly since every
0 is converted to '/', to keep the same parsing code for dref type 2
and type 18: this makes the external reference point to a non-existing
direactory, rather than to the actual referenced file.

Add a brief trimming loop that drops all ending 0s before trying to
parse the external reference path.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
This commit is contained in:
Vittorio Giovara 2016-02-15 21:44:07 -05:00
parent 0b6e5d6b32
commit d40cb726d2
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/mov.c
View File

@ -554,6 +554,13 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
memmove(dref->path, dref->path+volume_len, len); memmove(dref->path, dref->path+volume_len, len);
dref->path[len] = 0; dref->path[len] = 0;
} }
// trim string of any ending zeros
for (j = len - 1; j >= 0; j--) {
if (dref->path[j] == 0)
len--;
else
break;
}
for (j = 0; j < len; j++) for (j = 0; j < len; j++)
if (dref->path[j] == ':' || dref->path[j] == 0) if (dref->path[j] == ':' || dref->path[j] == 0)
dref->path[j] = '/'; dref->path[j] = '/';