diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-08-21 19:17:24 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-09-12 18:51:46 +0200 |
| commit | 4381bddc9f93da34a44e683bdc4c05c6f061244e (patch) | |
| tree | 553faad5494c1b15bde6348ec79e83121baa1d3e /libavfilter/avfilter.h | |
| parent | 2c0317419bc8c7f28496d5181d951bbe8837071f (diff) | |
| download | ffmpeg-4381bddc9f93da34a44e683bdc4c05c6f061244e.tar.gz | |
lavfi: consistently use int for sample_rate in AVFilterLink and AVFilterBufferRefAudioProps
Also consistent with AVCodecContext.sample_rate. Simplify/avoid
pointless type checks and conversions.
Breaks audio API/ABI.
Diffstat (limited to 'libavfilter/avfilter.h')
| -rw-r--r-- | libavfilter/avfilter.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 51f1a6b1e0..f92035ff7b 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -106,7 +106,7 @@ typedef struct AVFilterBuffer { typedef struct AVFilterBufferRefAudioProps { int64_t channel_layout; ///< channel layout of audio buffer int nb_samples; ///< number of audio samples per channel - uint32_t sample_rate; ///< audio buffer sample rate + int sample_rate; ///< audio buffer sample rate int planar; ///< audio buffer - planar or packed } AVFilterBufferRefAudioProps; @@ -623,7 +623,11 @@ struct AVFilterLink { AVRational sample_aspect_ratio; ///< agreed upon sample aspect ratio /* These parameters apply only to audio */ int64_t channel_layout; ///< channel layout of current buffer (see libavutil/audioconvert.h) +#if LIBAVFILTER_VERSION_MAJOR < 3 int64_t sample_rate; ///< samples per second +#else + int sample_rate; ///< samples per second +#endif int planar; ///< agreed upon packing mode of audio buffers. true if planar. int format; ///< agreed upon media format |