diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-06-02 11:14:24 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-06-06 10:12:46 +0200 |
| commit | 0bc2cca12f671010eac171bc22049320a7cd61a3 (patch) | |
| tree | be6c39d00b05ea634b8fe30dcbf38db14b7a11ba | |
| parent | e1c74148128ebed7c7bc9d36c776f24898267174 (diff) | |
| download | ffmpeg-0bc2cca12f671010eac171bc22049320a7cd61a3.tar.gz | |
samplefmt: switch nb_channels/nb_samples params order in av_samples_alloc()
This is consistent with the order of parameters in
av_samples_fill_arrays().
| -rw-r--r-- | doc/APIchanges | 4 | ||||
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/samplefmt.c | 2 | ||||
| -rw-r--r-- | libavutil/samplefmt.h | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 6c32ed9674..16373e6933 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2011-04-18 API changes, most recent first: +2011-06-06 - xxxxxx - lavu 51.6.0 - av_samples_alloc() + Switch nb_channels and nb_samples parameters order in + av_samples_alloc(). + 2011-06-06 - xxxxxx - lavu 51.5.0 - av_samples_* Change the data layout created by av_samples_fill_arrays() and av_samples_alloc(). diff --git a/libavutil/avutil.h b/libavutil/avutil.h index fd5f293859..1912d20170 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -40,7 +40,7 @@ #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 5 +#define LIBAVUTIL_VERSION_MINOR 6 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index ca669da8b5..041aaeaa9f 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -103,7 +103,7 @@ int av_samples_fill_arrays(uint8_t *pointers[8], int linesizes[8], } int av_samples_alloc(uint8_t *pointers[8], int linesizes[8], - int nb_samples, int nb_channels, + int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int planar, int align) { diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index a091721d96..30da046628 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -101,6 +101,7 @@ int av_samples_fill_arrays(uint8_t *pointers[8], int linesizes[8], * The allocated samples buffer has to be freed by using * av_freep(&pointers[0]). * + * @param nb_channels number of audio channels * @param nb_samples number of samples per channel * @param planar 1 if the samples layout is planar, 0 if packed, * @param align the value to use for buffer size alignment @@ -109,7 +110,7 @@ int av_samples_fill_arrays(uint8_t *pointers[8], int linesizes[8], * @see av_samples_fill_arrays() */ int av_samples_alloc(uint8_t *pointers[8], int linesizes[8], - int nb_samples, int nb_channels, + int nb_channels, int nb_samples, enum AVSampleFormat sample_fmt, int planar, int align); |