virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-11-23 21:54:53 +02:00
Code Issues Releases Activity
Files
3acadc89f495366a1c7de234b33df7464fd64acd
FFmpeg/libavutil/time.h
Michael Niedermayer e96ca404ea Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5' 
* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
  lavu: Add av_gettime_relative

Conflicts:
	libavutil/time.c
	libavutil/time.h
	libavutil/version.h

See: 0eec06ed87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 11:06:56 +02:00

1.8 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink