diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-15 17:31:34 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-01-15 17:31:34 +0000 |
| commit | a242ac3620e8610d7efa3852018c79c09546bec4 (patch) | |
| tree | 1c2294ed0b86405faaff18bb926228a31fb7904e | |
| parent | 6baf4afa9969eea23cd4ec9b0cec3b7aed1f49af (diff) | |
| download | ffmpeg-a242ac3620e8610d7efa3852018c79c09546bec4.tar.gz | |
Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples.
More consistent with the rest of FFmpeg and sounds more natural to
English speaking people.
Originally committed as revision 26374 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | doc/APIchanges | 3 | ||||
| -rw-r--r-- | libavfilter/avfilter.c | 2 | ||||
| -rw-r--r-- | libavfilter/avfilter.h | 6 | ||||
| -rw-r--r-- | libavfilter/defaults.c | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 63cb0ddcb5..6affb0b5cf 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,9 @@ libavutil: 2009-03-08 API changes, most recent first: +2011-01-15 - r26374 - lavfi 1.74.0 - AVFilterBufferRefAudioProps + Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples. + 2011-01-14 - r26330 - lavf 52.93.0 - av_metadata_copy() Add av_metadata_copy() in avformat.h. diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 4fbb6bf4a6..5a0ab8ef32 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -235,7 +235,7 @@ void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end) if (ref->audio) { dprintf(ctx, " cl:%"PRId64"d sn:%d s:%d sr:%d p:%d", ref->audio->channel_layout, - ref->audio->samples_nb, + ref->audio->nb_samples, ref->audio->size, ref->audio->sample_rate, ref->audio->planar); diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h index 5b08941693..22b8b1ca5b 100644 --- a/libavfilter/avfilter.h +++ b/libavfilter/avfilter.h @@ -27,8 +27,8 @@ #include "libavcore/samplefmt.h" #define LIBAVFILTER_VERSION_MAJOR 1 -#define LIBAVFILTER_VERSION_MINOR 73 -#define LIBAVFILTER_VERSION_MICRO 2 +#define LIBAVFILTER_VERSION_MINOR 74 +#define LIBAVFILTER_VERSION_MICRO 0 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ @@ -99,7 +99,7 @@ typedef struct AVFilterBuffer { */ typedef struct AVFilterBufferRefAudioProps { int64_t channel_layout; ///< channel layout of audio buffer - int samples_nb; ///< number of audio samples + int nb_samples; ///< number of audio samples int size; ///< audio buffer size uint32_t sample_rate; ///< audio buffer sample rate int planar; ///< audio buffer - planar or packed diff --git a/libavfilter/defaults.c b/libavfilter/defaults.c index aa3739cca6..c541bb1687 100644 --- a/libavfilter/defaults.c +++ b/libavfilter/defaults.c @@ -88,7 +88,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per chans_nb = av_get_channel_layout_nb_channels(channel_layout); per_channel_size = size/chans_nb; - ref->audio->samples_nb = per_channel_size/sample_size; + ref->audio->nb_samples = per_channel_size/sample_size; /* Set the number of bytes to traverse to reach next sample of a particular channel: * For planar, this is simply the sample size. |