Browse Source

lavfi: remove disabled FF_API_SAMPLERATE64 cruft

Anton Khirnov 12 years ago
parent
commit
6c1e065bd4
3 changed files with 0 additions and 11 deletions
  1. 0 4
      libavfilter/af_resample.c
  2. 0 4
      libavfilter/avfilter.h
  3. 0 3
      libavfilter/version.h

+ 0 - 4
libavfilter/af_resample.c

@@ -119,11 +119,7 @@ static int config_output(AVFilterLink *outlink)
     av_get_channel_layout_string(buf2, sizeof(buf2),
                                  -1, outlink->channel_layout);
     av_log(ctx, AV_LOG_VERBOSE,
-#if FF_API_SAMPLERATE64
-           "fmt:%s srate:%"PRId64" cl:%s -> fmt:%s srate:%"PRId64" cl:%s\n",
-#else
            "fmt:%s srate:%d cl:%s -> fmt:%s srate:%d cl:%s\n",
-#endif /* FF_API_SAMPLERATE64 */
            av_get_sample_fmt_name(inlink ->format), inlink ->sample_rate, buf1,
            av_get_sample_fmt_name(outlink->format), outlink->sample_rate, buf2);
 

+ 0 - 4
libavfilter/avfilter.h

@@ -541,11 +541,7 @@ 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
 

+ 0 - 3
libavfilter/version.h

@@ -44,9 +44,6 @@
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  */
-#ifndef FF_API_SAMPLERATE64
-#define FF_API_SAMPLERATE64             (LIBAVFILTER_VERSION_MAJOR < 3)
-#endif
 #ifndef FF_API_VSRC_BUFFER_ADD_FRAME
 #define FF_API_VSRC_BUFFER_ADD_FRAME        (LIBAVFILTER_VERSION_MAJOR < 3)
 #endif