| @@ -1547,29 +1547,29 @@ eoi_parser: | |||||
| av_log(avctx, AV_LOG_WARNING, | av_log(avctx, AV_LOG_WARNING, | ||||
| "Found EOI before any SOF, ignoring\n"); | "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; | |||||
| *got_frame = 1; | |||||
| if (!s->lossless) { | |||||
| picture->quality = FFMAX3(s->qscale[0], | |||||
| s->qscale[1], | |||||
| s->qscale[2]); | |||||
| picture->qstride = 0; | |||||
| picture->qscale_table = s->qscale_table; | |||||
| memset(picture->qscale_table, picture->quality, | |||||
| (s->width + 15) / 16); | |||||
| if (avctx->debug & FF_DEBUG_QP) | |||||
| av_log(avctx, AV_LOG_DEBUG, | |||||
| "QP: %d\n", picture->quality); | |||||
| picture->quality *= FF_QP2LAMBDA; | |||||
| } | |||||
| } | |||||
| *picture = *s->picture_ptr; | |||||
| *got_frame = 1; | |||||
| if (!s->lossless) { | |||||
| picture->quality = FFMAX3(s->qscale[0], | |||||
| s->qscale[1], | |||||
| s->qscale[2]); | |||||
| picture->qstride = 0; | |||||
| picture->qscale_table = s->qscale_table; | |||||
| memset(picture->qscale_table, picture->quality, | |||||
| (s->width + 15) / 16); | |||||
| if (avctx->debug & FF_DEBUG_QP) | |||||
| av_log(avctx, AV_LOG_DEBUG, | |||||
| "QP: %d\n", picture->quality); | |||||
| picture->quality *= FF_QP2LAMBDA; | |||||
| } | |||||
| goto the_end; | goto the_end; | ||||
| case SOS: | case SOS: | ||||