RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AVRn: fix progressive 

Fixes Ticket970

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-20 02:50:59 +02:00
parent ba2cf854d0
commit b1acf5d7a6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/avrndec.c
View File

@ -76,6 +76,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
AVFrame *p = &a->frame; AVFrame *p = &a->frame;
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size; int buf_size = avpkt->size;
int true_height = buf_size / (2*avctx->width);
int y; int y;
if(a->is_mjpeg) if(a->is_mjpeg)
@ -97,7 +98,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
p->key_frame= 1; p->key_frame= 1;
if(a->interlace) { if(a->interlace) {
int true_height = buf_size / (2*avctx->width);
buf += (true_height - avctx->height)*avctx->width; buf += (true_height - avctx->height)*avctx->width;
for(y = 0; y < avctx->height-1; y+=2) { for(y = 0; y < avctx->height-1; y+=2) {
memcpy(p->data[0] + (y+ a->tff)*p->linesize[0], buf , 2*avctx->width); memcpy(p->data[0] + (y+ a->tff)*p->linesize[0], buf , 2*avctx->width);
@ -105,6 +105,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
buf += 2*avctx->width; buf += 2*avctx->width;
} }
} else { } else {
buf += (true_height - avctx->height)*avctx->width*2;
for(y = 0; y < avctx->height; y++) { for(y = 0; y < avctx->height; y++) {
memcpy(p->data[0] + y*p->linesize[0], buf, 2*avctx->width); memcpy(p->data[0] + y*p->linesize[0], buf, 2*avctx->width);
buf += 2*avctx->width; buf += 2*avctx->width;