Commit 050f2b3e authored by Mans Rullgard's avatar Mans Rullgard

mjpeg: remove pointless braces around block of code

Signed-off-by: 's avatarMans Rullgard <mans@mansr.com>
parent 5d20f19b
...@@ -1520,28 +1520,26 @@ eoi_parser: ...@@ -1520,28 +1520,26 @@ eoi_parser:
av_log(avctx, AV_LOG_WARNING, "Found EOI before any SOF, ignoring\n"); av_log(avctx, AV_LOG_WARNING, "Found EOI before any SOF, ignoring\n");
break; break;
} }
{ if (s->interlaced) {
if (s->interlaced) { s->bottom_field ^= 1;
s->bottom_field ^= 1; /* if not bottom field, do not output image yet */
/* if not bottom field, do not output image yet */ if (s->bottom_field == !s->interlace_polarity)
if (s->bottom_field == !s->interlace_polarity) goto not_the_end;
goto not_the_end; }
} *picture = *s->picture_ptr;
*picture = *s->picture_ptr; *data_size = sizeof(AVFrame);
*data_size = sizeof(AVFrame);
if(!s->lossless){
if(!s->lossless){ picture->quality= FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]);
picture->quality= FFMAX3(s->qscale[0], s->qscale[1], s->qscale[2]); picture->qstride= 0;
picture->qstride= 0; picture->qscale_table= s->qscale_table;
picture->qscale_table= s->qscale_table; memset(picture->qscale_table, picture->quality, (s->width+15)/16);
memset(picture->qscale_table, picture->quality, (s->width+15)/16); if(avctx->debug & FF_DEBUG_QP)
if(avctx->debug & FF_DEBUG_QP) av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality); picture->quality*= FF_QP2LAMBDA;
picture->quality*= FF_QP2LAMBDA;
}
goto the_end;
} }
goto the_end;
break; break;
case SOS: case SOS:
if (!s->got_picture) { if (!s->got_picture) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment