[FFmpeg-cvslog] avcodec/m101: simplify 8bit code

Michael Niedermayer git at videolan.org
Sat May 7 05:12:23 CEST 2016


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Sat May  7 03:43:17 2016 +0200| [fc6894770ea974f2a1a8605f7e5cd46f3f75772a] | committer: Michael Niedermayer

avcodec/m101: simplify 8bit code

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fc6894770ea974f2a1a8605f7e5cd46f3f75772a
---

 libavcodec/m101.c |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/libavcodec/m101.c b/libavcodec/m101.c
index 75247d3..f005670 100644
--- a/libavcodec/m101.c
+++ b/libavcodec/m101.c
@@ -45,7 +45,6 @@ static int m101_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
     int stride, ret;
     int x, y;
     int min_stride = 2 * avctx->width;
-    uint8_t *line;
     int bits = avctx->extradata[2*4];
     AVFrame *frame = data;
 
@@ -65,7 +64,6 @@ static int m101_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
         return AVERROR_INVALIDDATA;
     }
 
-    line = frame->data[0];
     frame->interlaced_frame = ((avctx->extradata[3*4] & 3) != 3);
     if (frame->interlaced_frame)
         frame->top_field_first = avctx->extradata[3*4] & 1;
@@ -75,10 +73,8 @@ static int m101_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
         if (frame->interlaced_frame)
             src_y = ((y&1)^frame->top_field_first) ? y/2 : (y/2 + avctx->height/2);
         if (bits == 8) {
-            for (x = 0; x < avctx->width; x++) {
-                line[y*frame->linesize[0] + 2*x + 0] = buf[src_y*stride + 2*x + 0];
-                line[y*frame->linesize[0] + 2*x + 1] = buf[src_y*stride + 2*x + 1];
-            }
+            uint8_t *line = frame->data[0] + y*frame->linesize[0];
+            memcpy(line, buf + src_y*stride, 2*avctx->width);
         } else {
             int block;
             uint16_t *luma = (uint16_t*)&frame->data[0][y*frame->linesize[0]];



More information about the ffmpeg-cvslog mailing list