diff options
| author | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:20 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-06-21 21:55:34 +0200 |
| commit | 8ef57a0d6154119e1a616dd8c29e8c32e35808a0 (patch) | |
| tree | 26c51bc5d99260b44ba3a2585091ca764559f939 /libavcodec/flicvideo.c | |
| parent | 373b82066cd4d0c7f42af9b03e8cdc1085e1a6e5 (diff) | |
| parent | 41ed7ab45fc693f7d7fc35664c0233f4c32d69bb (diff) | |
| download | ffmpeg-streaming-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.zip ffmpeg-streaming-8ef57a0d6154119e1a616dd8c29e8c32e35808a0.tar.gz | |
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 7535a40..c9c6c24 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -1,6 +1,6 @@ /* * FLI/FLC Animation Video Decoder - * Copyright (c) 2003, 2004 The FFmpeg Project + * Copyright (C) 2003, 2004 The FFmpeg project * * This file is part of FFmpeg. * @@ -133,7 +133,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx) case 8 : avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 15 : avctx->pix_fmt = AV_PIX_FMT_RGB555; break; case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break; - case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but havent any files to test with */ + case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but no files to test with */ avpriv_request_sample(avctx, "24Bpp FLC/FLX"); return AVERROR_PATCHWELCOME; default : @@ -793,7 +793,7 @@ static int flic_decode_frame(AVCodecContext *avctx, /* Should not get here, ever as the pix_fmt is processed */ /* in flic_decode_init and the above if should deal with */ - /* the finite set of possibilites allowable by here. */ + /* the finite set of possibilities allowable by here. */ /* But in case we do, just error out. */ av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n"); return AVERROR_BUG; |
