diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:32:52 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 20:32:52 +0400 |
| commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
| tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /libavcodec/resample.c | |
| parent | a41bf09d9c56215448f14fb086c9f882eb41ecac (diff) | |
| parent | 511cf612ac979f536fd65e14603a87ca5ad435f3 (diff) | |
Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
miscellaneous typo fixes
Conflicts:
libavcodec/4xm.c
libavcodec/lagarith.c
libavcodec/parser.c
libavcodec/ratecontrol.c
libavcodec/shorten.c
libavcodec/vda_h264.c
libavformat/dvenc.c
libavformat/wtv.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/resample.c')
| -rw-r--r-- | libavcodec/resample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/resample.c b/libavcodec/resample.c index dfaad66216..f9502880e0 100644 --- a/libavcodec/resample.c +++ b/libavcodec/resample.c @@ -406,7 +406,7 @@ int audio_resample(ReSampleContext *s, short *output, short *input, int nb_sampl if (av_audio_convert(s->convert_ctx[1], obuf, ostride, ibuf, istride, nb_samples1 * s->output_channels) < 0) { av_log(s->resample_context, AV_LOG_ERROR, - "Audio sample format convertion failed\n"); + "Audio sample format conversion failed\n"); return 0; } } |