generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi: change AVFilterLink.sample_rate from int64_t to int on next bump

Browse Source 
There is no real reason for it to be 64bit, it's just a plain int in the
rest of Libav.
This commit is contained in:
Anton Khirnov 2012-05-09 08:43:07 +02:00
parent a6bdfc2a92
commit f20ab492ac
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/avfilter.h
View File

@ -596,7 +596,11 @@ struct AVFilterLink {
AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio
/* These two parameters apply only to audio */ /* These two parameters apply only to audio */
uint64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) uint64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h)
#if FF_API_SAMPLERATE64
int64_t sample_rate; ///< samples per second int64_t sample_rate; ///< samples per second
#else
int sample_rate; ///< samples per second
#endif
int format; ///< agreed upon media format int format; ///< agreed upon media format

3
libavfilter/version.h
View File

@ -47,5 +47,8 @@
#ifndef FF_API_GRAPH_AVCLASS #ifndef FF_API_GRAPH_AVCLASS
#define FF_API_GRAPH_AVCLASS (LIBAVFILTER_VERSION_MAJOR > 2) #define FF_API_GRAPH_AVCLASS (LIBAVFILTER_VERSION_MAJOR > 2)
#endif #endif
#ifndef FF_API_SAMPLERATE64
#define FF_API_SAMPLERATE64 (LIBAVFILTER_VERSION_MAJOR < 3)
#endif
#endif // AVFILTER_VERSION_H #endif // AVFILTER_VERSION_H