virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

samplefmt: switch nb_channels/nb_samples params order in av_samples_alloc()

Browse Source 
This is consistent with the order of parameters in
av_samples_fill_arrays().
This commit is contained in:
Stefano Sabatini 2011-06-02 11:14:24 +02:00
parent e1c7414812
commit 0bc2cca12f
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/APIchanges
View File

@ -13,6 +13,10 @@ libavutil: 2011-04-18
API changes, most recent first: 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_* 2011-06-06 - xxxxxx - lavu 51.5.0 - av_samples_*
Change the data layout created by av_samples_fill_arrays() and Change the data layout created by av_samples_fill_arrays() and
av_samples_alloc(). av_samples_alloc().

2
libavutil/avutil.h
View File

@ -40,7 +40,7 @@
#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c) #define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
#define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MAJOR 51
#define LIBAVUTIL_VERSION_MINOR 5 #define LIBAVUTIL_VERSION_MINOR 6
#define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_MICRO 0
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \

2
libavutil/samplefmt.c
View File

@ -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 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, enum AVSampleFormat sample_fmt, int planar,
int align) int align)
{ {

3
libavutil/samplefmt.h
View File

@ -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 * The allocated samples buffer has to be freed by using
* av_freep(&pointers[0]). * av_freep(&pointers[0]).
* *
* @param nb_channels number of audio channels
* @param nb_samples number of samples per channel * @param nb_samples number of samples per channel
* @param planar 1 if the samples layout is planar, 0 if packed, * @param planar 1 if the samples layout is planar, 0 if packed,
* @param align the value to use for buffer size alignment * @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() * @see av_samples_fill_arrays()
*/ */
int av_samples_alloc(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, enum AVSampleFormat sample_fmt, int planar,
int align); int align);