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/pngenc.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/pngenc.c')
| -rw-r--r-- | libavcodec/pngenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index c91f28941f..7ba14b2d0d 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -372,7 +372,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, int pass; for(pass = 0; pass < NB_PASSES; pass++) { - /* NOTE: a pass is completely omited if no pixels would be + /* NOTE: a pass is completely omitted if no pixels would be output */ pass_row_size = ff_png_pass_row_size(pass, bits_per_pixel, avctx->width); if (pass_row_size > 0) { |