diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-21 17:32:52 +0100 |
| commit | d27edc038a5d59f25b28964b38d9f8d7ce4a6e64 (patch) | |
| tree | b43acbce10229c375ac3b21c80a6c2c09354da8d /libavcodec/4xm.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/4xm.c')
| -rw-r--r-- | libavcodec/4xm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 8fa214f1b4..de5c9f53ee 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -842,7 +842,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, cfrm->size + data_size + FF_INPUT_BUFFER_PADDING_SIZE); // explicit check needed as memcpy below might not catch a NULL if (!cfrm->data) { - av_log(f->avctx, AV_LOG_ERROR, "realloc falure\n"); + av_log(f->avctx, AV_LOG_ERROR, "realloc failure\n"); return -1; } |