diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:19:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 16:25:23 +0200 |
| commit | 18b0c39f99eee508107c47345494e535b8757434 (patch) | |
| tree | b1418e52aab2f1fb8a171c3bb3fada3c7b0df531 /libavresample | |
| parent | d9d0c1ccc3df39fecbbbb6b600c18542741c5a51 (diff) | |
| parent | 05c36e0e5fbf0b75dbbbd327ad2f6a62992f9262 (diff) | |
| download | ffmpeg-18b0c39f99eee508107c47345494e535b8757434.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
g723.1: fix addition overflow
g723.1: simplify and fix multiplication overflow
g723.1: deobfuscate an expression
g723.1: remove unused #includes
ARM: add missing "cc" clobber in av_clipl_int32_arm()
rtmp: Factorize the code by adding handle_invoke_error
rtmp: Factorize the code by adding handle_invoke_status
rtmp: Factorize the code by adding handle_invoke_result
libavutil: remove unused av_abort() macro
ffmenc: replace if/abort with assert()
libavutil: drop offsetof() fallback definition
libavutil: drop fallback definitions of INTxx_MIN/MAX
configure: Check for a sctp struct instead of just the header
configure: suncc: Add -xc99 to dependency flags, required on Solaris
doxygen: Fix function parameter names to match the code
doc: Drop obsolete shared libs cflags hint to workaround Cygwin gcc bugs
swf: Move shared table out of the header file
swf: Move swf_audio_codec_tags table to the only place it is used
fate: add G.723.1 decoder tests
Conflicts:
configure
doc/platform.texi
libavformat/Makefile
libavutil/arm/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/audio_convert.h | 2 | ||||
| -rw-r--r-- | libavresample/audio_mix.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavresample/audio_convert.h b/libavresample/audio_convert.h index 9227763628..eefffbb12c 100644 --- a/libavresample/audio_convert.h +++ b/libavresample/audio_convert.h @@ -42,7 +42,7 @@ typedef struct AudioConvert AudioConvert; * @param in_fmt input sample format * @param channels number of channels, or 0 for any number of channels * @param ptr_align buffer pointer alignment, in bytes - * @param sample_align buffer size alignment, in samples + * @param samples_align buffer size alignment, in samples * @param descr function type description (e.g. "C" or "SSE") * @param conv conversion function pointer */ diff --git a/libavresample/audio_mix.h b/libavresample/audio_mix.h index 61db33047d..2199fffe0e 100644 --- a/libavresample/audio_mix.h +++ b/libavresample/audio_mix.h @@ -69,7 +69,7 @@ typedef struct AudioMix { * @param in_channels number of input channels, or 0 for any number of channels * @param out_channels number of output channels, or 0 for any number of channels * @param ptr_align buffer pointer alignment, in bytes - * @param sample_align buffer size alignment, in samples + * @param samples_align buffer size alignment, in samples * @param descr function type description (e.g. "C" or "SSE") * @param mix_func mixing function pointer */ |