diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-22 22:34:02 +0200 |
| commit | e847f4128543432a77fb8f85c313646a406c76f6 (patch) | |
| tree | c23fd3d3cd7904fae57c6a3e7395e10e58ae5579 /libavformat/avformat.h | |
| parent | 492cc9bcc4a50b4213648c1b8dcb7c28d17ea8f7 (diff) | |
| parent | 9ee3334840c0d8564ca73dbfd6cd5a01bcdca79b (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libspeexenc: add supported sample rates and channel layouts.
Replace usleep() calls with av_usleep()
lavu: add av_usleep() function
utvideo: mark interlaced frames as such
utvideo: Fix interlaced prediction for RGB utvideo.
cosmetics: do not use full path for local headers
lavu/file: include unistd.h only when available
configure: check for unistd.h
log: include unistd.h only when needed
lavf: include libavutil/time.h instead of redeclaring av_gettime()
Conflicts:
configure
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/utvideo.c
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index efab990f16..143c48e17d 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -201,6 +201,10 @@ #include "avio.h" #include "libavformat/version.h" +#if FF_API_AV_GETTIME +#include "libavutil/time.h" +#endif + struct AVFormatContext; @@ -1854,10 +1858,6 @@ void av_dump_format(AVFormatContext *ic, const char *url, int is_output); -#if FF_API_AV_GETTIME -int64_t av_gettime(void); -#endif - /** * Return in 'buf' the path with '%d' replaced by a number. * |