Merge commit '1f77e634bb838f71ff21923b5e9fe3104c831c52'

[ffmpeg] / libavcodec / tdsc.c

diff --git a/libavcodec/tdsc.c b/libavcodec/tdsc.c
index 63cd44341d5cb5d3c5666200397610b391b8a5cd..d1265a006d372fcdfedcf85f7eca75f9e3e371b4 100644 (file)
--- a/libavcodec/tdsc.c
+++ b/libavcodec/tdsc.c
@@ -56,7 +56,7 @@ typedef struct TDSCContext {
     AVFrame *jpgframe;          // decoded JPEG tile
     uint8_t *tilebuffer;        // buffer containing tile data
 
-    /* zlib interation */
+    /* zlib interaction */
     uint8_t *deflatebuffer;
     uLongf deflatelen;
 
@@ -365,7 +365,7 @@ static int tdsc_decode_jpeg_tile(AVCodecContext *avctx, int tile_size,
             return 0;
     }
 
-    /* Let's paint ont the buffer */
+    /* Let's paint onto the buffer */
     tdsc_blit(ctx->refframe->data[0] + x * 3 + ctx->refframe->linesize[0] * y,
               ctx->refframe->linesize[0],
               ctx->jpgframe->data[0], ctx->jpgframe->linesize[0],