ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri
Jul 17 14:40:19 2015 +0200| [694f9ab1ef141cf80de8f81db6955a17606182af] |
committer: Michael Niedermayer
Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
Revert "mov: Double-check that alias path is not an absolute path"
Conflicts:
libavformat/mov.c
See: c9c7263e5820c957598643216c42be9b1c4f2d2b
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=694f9ab1ef141cf80de8f81db6955a17606182af
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
