1. ffmpeg
  2. Commit a242ac3620e8610d7efa3852018c79c09546bec4
Browse code

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

Stefano Sabatini authored on 2011/01/16 02:31:34
Showing 4 changed files
doc/APIchanges
History View file @ a242ac3
... ... 
@@ -13,6 +13,9 @@ libavutil:   2009-03-08
13 13
14 14 
 API changes, most recent first:
15 15
16 
+2011-01-15 - r26374 - lavfi 1.74.0 - AVFilterBufferRefAudioProps
17 
+  Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples.
18 
+
16 19 
 2011-01-14 - r26330 - lavf 52.93.0 - av_metadata_copy()
17 20 
   Add av_metadata_copy() in avformat.h.
18 21
libavfilter/avfilter.c
History View file @ a242ac3
... ... 
@@ -235,7 +235,7 @@ void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end)
235 235 
     if (ref->audio) {
236 236 
         dprintf(ctx, " cl:%"PRId64"d sn:%d s:%d sr:%d p:%d",
237 237 
                 ref->audio->channel_layout,
238 
-                ref->audio->samples_nb,
238 
+                ref->audio->nb_samples,
239 239 
                 ref->audio->size,
240 240 
                 ref->audio->sample_rate,
241 241 
                 ref->audio->planar);
libavfilter/avfilter.h
History View file @ a242ac3
... ... 
@@ -27,8 +27,8 @@
27 27 
 #include "libavcore/samplefmt.h"
28 28
29 29 
 #define LIBAVFILTER_VERSION_MAJOR  1
30 
-#define LIBAVFILTER_VERSION_MINOR 73
31 
-#define LIBAVFILTER_VERSION_MICRO  2
30 
+#define LIBAVFILTER_VERSION_MINOR 74
31 
+#define LIBAVFILTER_VERSION_MICRO  0
32 32
33 33 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
34 34 
                                                LIBAVFILTER_VERSION_MINOR, \
... ... 
@@ -99,7 +99,7 @@ typedef struct AVFilterBuffer {
99 99 
  */
100 100 
 typedef struct AVFilterBufferRefAudioProps {
101 101 
     int64_t channel_layout;     ///< channel layout of audio buffer
102 
-    int samples_nb;             ///< number of audio samples
102 
+    int nb_samples;             ///< number of audio samples
103 103 
     int size;                   ///< audio buffer size
104 104 
     uint32_t sample_rate;       ///< audio buffer sample rate
105 105 
     int planar;                 ///< audio buffer - planar or packed
libavfilter/defaults.c
History View file @ a242ac3
... ... 
@@ -88,7 +88,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per
88 88 
     chans_nb = av_get_channel_layout_nb_channels(channel_layout);
89 89
90 90 
     per_channel_size = size/chans_nb;
91 
-    ref->audio->samples_nb = per_channel_size/sample_size;
91 
+    ref->audio->nb_samples = per_channel_size/sample_size;
92 92
93 93 
     /* Set the number of bytes to traverse to reach next sample of a particular channel:
94 94 
      * For planar, this is simply the sample size.