diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-09-27 17:37:22 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-09-27 17:37:22 +0000 |
| commit | fff5e687a12e35265a24fe15d087706b8fdc8ca0 (patch) | |
| tree | 481d95a903d1eba9c3d5c90502f025b19adc8a62 | |
| parent | 9bce82fa00271920cc2497989834dd35301e4580 (diff) | |
| download | ffmpeg-fff5e687a12e35265a24fe15d087706b8fdc8ca0.tar.gz | |
Move doxygen comments for av_gettime from utils.c to avformat.h.
Originally committed as revision 15439 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 1 | ||||
| -rw-r--r-- | libavformat/utils.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 072be39632..89b3b2fd70 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1034,6 +1034,7 @@ attribute_deprecated int parse_frame_rate(int *frame_rate, int *frame_rate_base, */ int64_t parse_date(const char *datestr, int duration); +/** Gets the current time in microseconds. */ int64_t av_gettime(void); /* ffm specific for ffserver */ diff --git a/libavformat/utils.c b/libavformat/utils.c index 8938c499f5..f6101e33b4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2853,9 +2853,6 @@ int parse_frame_rate(int *frame_rate_num, int *frame_rate_den, const char *arg) return ret; } -/** - * Gets the current time in microseconds. - */ int64_t av_gettime(void) { struct timeval tv; |