[FFmpeg-cvslog] lavfi: change AVFilterLink.sample_rate from int64_t to int on next bump

Anton Khirnov git at videolan.org
Thu May 10 23:33:13 CEST 2012


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Wed May  9 08:43:07 2012 +0200| [f20ab492acd2ab49f859dcd6d310029fb8c09dc4] | committer: Anton Khirnov

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.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f20ab492acd2ab49f859dcd6d310029fb8c09dc4
---

 libavfilter/avfilter.h |    4 ++++
 libavfilter/version.h  |    3 +++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 357ce34..69ada1b 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 718ed78..71928f3 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



More information about the ffmpeg-cvslog mailing list