[FFmpeg-cvslog] pictordec: support uncompressed images

[Peter Ross]

ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Fri Dec  2 19:57:34 2011 +1100| [1fd69243201741e1ad9026cdfd72194d25caceef] | committer: Michael Niedermayer

pictordec: support uncompressed images

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavcodec/pictordec.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libavcodec/pictordec.c b/libavcodec/pictordec.c
index ca3e791..ed372bc 100644
--- a/libavcodec/pictordec.c
+++ b/libavcodec/pictordec.c
@@ -198,10 +198,10 @@ static int decode_frame(AVCodecContext *avctx,
     buf += esize;
 
 
-    x = 0;
     y = s->height - 1;
-    plane = 0;
     if (bytestream_get_le16(&buf)) {
+        x = 0;
+        plane = 0;
         while (y >= 0 && buf_end - buf >= 6) {
             const uint8_t *buf_pend = buf + FFMIN(AV_RL16(buf), buf_end - buf);
             //ignore uncompressed block size reported at buf[2]
@@ -228,8 +228,11 @@ static int decode_frame(AVCodecContext *avctx,
             }
         }
     } else {
-        av_log_ask_for_sample(avctx, "uncompressed image\n");
-        return buf_size;
+        while (y >= 0 && buf < buf_end) {
+            memcpy(s->frame.data[0] + y * s->frame.linesize[0], buf, FFMIN(avctx->width, buf_end - buf));
+            buf += avctx->width;
+            y--;
+        }
     }
 
     *data_size = sizeof(AVFrame);