[FFmpeg-cvslog] cllc: Use outbuf in RGB and ARGB functions

Derek Buitenhuis git at videolan.org
Tue Jun 25 17:53:42 CEST 2013


ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Mon Jun 24 14:12:16 2013 -0400| [d9c89ef86b9400e50c2486f9406fad15c85bab22] | committer: Derek Buitenhuis

cllc: Use outbuf in RGB and ARGB functions

Signed-off-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

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

 libavcodec/cllc.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c
index 070f84e..0e42c05 100644
--- a/libavcodec/cllc.c
+++ b/libavcodec/cllc.c
@@ -136,14 +136,13 @@ static int read_argb_line(CLLCContext *ctx, GetBitContext *gb, int *top_left,
 
     CLOSE_READER(bits, gb);
 
-    dst         -= 4 * ctx->avctx->width;
-    top_left[0]  = dst[0];
+    top_left[0]  = outbuf[0];
 
     /* Only stash components if they are not transparent */
     if (top_left[0]) {
-        top_left[1] = dst[1];
-        top_left[2] = dst[2];
-        top_left[3] = dst[3];
+        top_left[1] = outbuf[1];
+        top_left[2] = outbuf[2];
+        top_left[3] = outbuf[3];
     }
 
     return 0;
@@ -174,7 +173,7 @@ static int read_rgb24_component_line(CLLCContext *ctx, GetBitContext *gb,
     CLOSE_READER(bits, gb);
 
     /* Stash the first pixel */
-    *top_left = dst[-3 * ctx->avctx->width];
+    *top_left = outbuf[0];
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list