ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Sun Oct 26
02:06:40 2014 +0100| [3b709fd912749d7731fa954cfb3aedd18d8a666a] | committer:
Michael Niedermayer
Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'
* commit '9dcf2397219ca796f0fafce2a703770d6fd09920':
lavf: Check the return value of strftime
Conflicts:
libavformat/wtvdec.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3b709fd912749d7731fa954cfb3aedd18d8a666a
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
