ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Mon Sep 8
22:12:57 2014 +0200| [6daff3bd8f30881d489aefebeca13f87f5290337] | committer:
Michael Niedermayer
Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'
* commit '1ec335513f95bf2441f81d761ea127325ecd81a0':
time: Add missing zero
Conflicts:
libavutil/time.c
See: ebef9f5a56d7df91e010a177a80cfc8dbe394305
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6daff3bd8f30881d489aefebeca13f87f5290337
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
