generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename AVFilterBufferRefAudioProps.samples_nb to nb_samples.

Browse Source 
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
This commit is contained in:
Stefano Sabatini 2011-01-15 17:31:34 +00:00
parent 6baf4afa99
commit a242ac3620
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/APIchanges
View File

@ -13,6 +13,9 @@ libavutil: 2009-03-08
API changes, most recent first: 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() 2011-01-14 - r26330 - lavf 52.93.0 - av_metadata_copy()
Add av_metadata_copy() in avformat.h. Add av_metadata_copy() in avformat.h.

2
libavfilter/avfilter.c
View File

@ -235,7 +235,7 @@ void ff_dprintf_ref(void *ctx, AVFilterBufferRef *ref, int end)
if (ref->audio) { if (ref->audio) {
dprintf(ctx, " cl:%"PRId64"d sn:%d s:%d sr:%d p:%d", dprintf(ctx, " cl:%"PRId64"d sn:%d s:%d sr:%d p:%d",
ref->audio->channel_layout, ref->audio->channel_layout,
ref->audio->samples_nb, ref->audio->nb_samples,
ref->audio->size, ref->audio->size,
ref->audio->sample_rate, ref->audio->sample_rate,
ref->audio->planar); ref->audio->planar);

6
libavfilter/avfilter.h
View File

@ -27,8 +27,8 @@
#include "libavcore/samplefmt.h" #include "libavcore/samplefmt.h"
#define LIBAVFILTER_VERSION_MAJOR 1 #define LIBAVFILTER_VERSION_MAJOR 1
#define LIBAVFILTER_VERSION_MINOR 73 #define LIBAVFILTER_VERSION_MINOR 74
#define LIBAVFILTER_VERSION_MICRO 2 #define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \ LIBAVFILTER_VERSION_MINOR, \
@ -99,7 +99,7 @@ typedef struct AVFilterBuffer {
*/ */
typedef struct AVFilterBufferRefAudioProps { typedef struct AVFilterBufferRefAudioProps {
int64_t channel_layout; ///< channel layout of audio buffer 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 int size; ///< audio buffer size
uint32_t sample_rate; ///< audio buffer sample rate uint32_t sample_rate; ///< audio buffer sample rate
int planar; ///< audio buffer - planar or packed int planar; ///< audio buffer - planar or packed

2
libavfilter/defaults.c
View File

@ -88,7 +88,7 @@ AVFilterBufferRef *avfilter_default_get_audio_buffer(AVFilterLink *link, int per
chans_nb = av_get_channel_layout_nb_channels(channel_layout); chans_nb = av_get_channel_layout_nb_channels(channel_layout);
per_channel_size = size/chans_nb; 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: /* Set the number of bytes to traverse to reach next sample of a particular channel:
* For planar, this is simply the sample size. * For planar, this is simply the sample size.