[FFmpeg-cvslog] r26374 - in trunk: doc/APIchanges libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/defaults.c

[stefano]

Author: stefano
Date: Sat Jan 15 18:31:34 2011
New Revision: 26374

Log:
Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples.

More consistent with the rest of FFmpeg and sounds more natural to
English speaking people.

Modified:
   trunk/doc/APIchanges
   trunk/libavfilter/avfilter.c
   trunk/libavfilter/avfilter.h
   trunk/libavfilter/defaults.c

Modified: trunk/doc/APIchanges
==============================================================================
--- trunk/doc/APIchanges	Sat Jan 15 18:21:15 2011	(r26373)
+++ trunk/doc/APIchanges	Sat Jan 15 18:31:34 2011	(r26374)
@@ -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.
 

Modified: trunk/libavfilter/avfilter.c
==============================================================================
--- trunk/libavfilter/avfilter.c	Sat Jan 15 18:21:15 2011	(r26373)
+++ trunk/libavfilter/avfilter.c	Sat Jan 15 18:31:34 2011	(r26374)
@@ -235,7 +235,7 @@ void ff_dprintf_ref(void *ctx, AVFilterB
     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);

Modified: trunk/libavfilter/avfilter.h
==============================================================================
--- trunk/libavfilter/avfilter.h	Sat Jan 15 18:21:15 2011	(r26373)
+++ trunk/libavfilter/avfilter.h	Sat Jan 15 18:31:34 2011	(r26374)
@@ -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

Modified: trunk/libavfilter/defaults.c
==============================================================================
--- trunk/libavfilter/defaults.c	Sat Jan 15 18:21:15 2011	(r26373)
+++ trunk/libavfilter/defaults.c	Sat Jan 15 18:31:34 2011	(r26374)
@@ -88,7 +88,7 @@ AVFilterBufferRef *avfilter_default_get_
     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.