diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-04 10:17:52 +0200 |
| commit | 0104570fb65bef9986a630e0188b3756295693a9 (patch) | |
| tree | d0612ebe9b9cdf7fcf7da0c6ced55c0609887e05 /libavcodec/flicvideo.c | |
| parent | 711c8ee71d719d6d89a523618f078bb17dbe1abf (diff) | |
| parent | a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7 (diff) | |
| download | ffmpeg-streaming-0104570fb65bef9986a630e0188b3756295693a9.zip ffmpeg-streaming-0104570fb65bef9986a630e0188b3756295693a9.tar.gz | |
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
silly typo fixes
Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 90885fc..a2f9ef9 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -593,7 +593,7 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, break; case FLI_LC: - av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-paletised FLC\n"); + av_log(avctx, AV_LOG_ERROR, "Unexpected FLI_LC chunk in non-palettized FLC\n"); bytestream2_skip(&g2, chunk_size - 6); break; |
