generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pictordec: support uncompressed images

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Peter Ross 2011-12-02 19:57:34 +11:00 committed by Michael Niedermayer
parent bba8975a9c
commit 1fd6924320
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/pictordec.c
View File

@ -198,10 +198,10 @@ static int decode_frame(AVCodecContext *avctx,
buf += esize; buf += esize;
x = 0;
y = s->height - 1; y = s->height - 1;
plane = 0;
if (bytestream_get_le16(&buf)) { if (bytestream_get_le16(&buf)) {
x = 0;
plane = 0;
while (y >= 0 && buf_end - buf >= 6) { while (y >= 0 && buf_end - buf >= 6) {
const uint8_t *buf_pend = buf + FFMIN(AV_RL16(buf), buf_end - buf); const uint8_t *buf_pend = buf + FFMIN(AV_RL16(buf), buf_end - buf);
//ignore uncompressed block size reported at buf[2] //ignore uncompressed block size reported at buf[2]
@ -228,8 +228,11 @@ static int decode_frame(AVCodecContext *avctx,
} }
} }
} else { } else {
av_log_ask_for_sample(avctx, "uncompressed image\n"); while (y >= 0 && buf < buf_end) {
return buf_size; 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); *data_size = sizeof(AVFrame);