diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-03-27 21:31:14 -0400 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2014-02-01 14:59:12 -0500 |
| commit | b68e5b119588cb1e01f8d16986f2a23db825d8b2 (patch) | |
| tree | 27f8028e626be7aa6612b35e4689793e7cbfab4f | |
| parent | cb5d0ea0bec119ecbe327bd7d3834987ab42ec1a (diff) | |
| download | ffmpeg-b68e5b119588cb1e01f8d16986f2a23db825d8b2.tar.gz | |
avutil: use align == 0 for default alignment in audio sample buffer functions
Fixes: http://pad.lv/1264886, http://pad.lv/1241439
(cherry picked from commit 0109a09dc3850eb5dbff84a7bb50eb252a5a8f22)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Conflicts:
libavutil/avutil.h
| -rw-r--r-- | libavutil/avutil.h | 2 | ||||
| -rw-r--r-- | libavutil/samplefmt.c | 4 | ||||
| -rw-r--r-- | libavutil/samplefmt.h | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 05e9248375..605be62384 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -155,7 +155,7 @@ #define LIBAVUTIL_VERSION_MAJOR 51 #define LIBAVUTIL_VERSION_MINOR 22 -#define LIBAVUTIL_VERSION_MICRO 1 +#define LIBAVUTIL_VERSION_MICRO 2 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ diff --git a/libavutil/samplefmt.c b/libavutil/samplefmt.c index f38d05e426..8d6125b763 100644 --- a/libavutil/samplefmt.c +++ b/libavutil/samplefmt.c @@ -104,6 +104,10 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, if (!sample_size || nb_samples <= 0 || nb_channels <= 0) return AVERROR(EINVAL); + /* auto-select alignment if not specified */ + if (!align) + align = 32; + /* check for integer overflow */ if (nb_channels > INT_MAX / align || (int64_t)nb_channels * nb_samples > (INT_MAX - (align * nb_channels)) / sample_size) diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index b6715561d4..91dcc02333 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -99,6 +99,7 @@ int av_sample_fmt_is_planar(enum AVSampleFormat sample_fmt); * @param nb_channels the number of channels * @param nb_samples the number of samples in a single channel * @param sample_fmt the sample format + * @param align buffer size alignment (0 = default, 1 = no alignment) * @return required buffer size, or negative error code on failure */ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, @@ -122,7 +123,7 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, * @param nb_channels the number of channels * @param nb_samples the number of samples in a single channel * @param sample_fmt the sample format - * @param align buffer size alignment (1 = no alignment required) + * @param align buffer size alignment (0 = default, 1 = no alignment) * @return 0 on success or a negative error code on failure */ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf, @@ -138,7 +139,7 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, uint8_t *buf, * @param[out] linesize aligned size for audio buffer(s) * @param nb_channels number of audio channels * @param nb_samples number of samples per channel - * @param align buffer size alignment (1 = no alignment required) + * @param align buffer size alignment (0 = default, 1 = no alignment) * @return 0 on success or a negative error code on failure * @see av_samples_fill_arrays() */ |