diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-05-09 08:43:07 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-05-09 20:31:26 +0200 |
| commit | f20ab492acd2ab49f859dcd6d310029fb8c09dc4 (patch) | |
| tree | 27f5a5feb0ccc9acdd34ce283d6d5eb32daacf47 /libavfilter | |
| parent | a6bdfc2a92a46aa7ee2d95a40f43b848ef94ec13 (diff) | |
| download | ffmpeg-f20ab492acd2ab49f859dcd6d310029fb8c09dc4.tar.gz | |
lavfi: change AVFilterLink.sample_rate from int64_t to int on next bump
There is no real reason for it to be 64bit, it's just a plain int in the
rest of Libav.
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfilter.h | 4 | ||||
| -rw-r--r-- | libavfilter/version.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 357ce34555..69ada1b8be 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -596,7 +596,11 @@ struct AVFilterLink { AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio /* These two parameters apply only to audio */ uint64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) +#if FF_API_SAMPLERATE64 int64_t sample_rate; ///< samples per second +#else + int sample_rate; ///< samples per second +#endif int format; ///< agreed upon media format diff --git a/libavfilter/version.h b/libavfilter/version.h index 718ed7812e..71928f3f3b 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -47,5 +47,8 @@ #ifndef FF_API_GRAPH_AVCLASS #define FF_API_GRAPH_AVCLASS (LIBAVFILTER_VERSION_MAJOR > 2) #endif +#ifndef FF_API_SAMPLERATE64 +#define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3) +#endif #endif // AVFILTER_VERSION_H |