[FFmpeg-cvslog] Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Wed Apr 13 16:21:00 2016 +0100| [feb1f7abc5873e2be6143c94e423315b57a159ef] | committer: Derek Buitenhuis

Merge commit 'd40cb726d271b0284642a1ba159eb26a5c579f77'

* commit 'd40cb726d271b0284642a1ba159eb26a5c579f77':
  mov: Trim dref absolute path

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=feb1f7abc5873e2be6143c94e423315b57a159ef
---

 libavformat/mov.c |    7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 06c15fb..73bff09 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -597,6 +597,13 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
                         memmove(dref->path, dref->path+volume_len, len);
                         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++)
                         if (dref->path[j] == ':' || dref->path[j] == 0)
                             dref->path[j] = '/';


======================================================================