virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

lavc/mjpegdec: cosmetics, org->orig

Browse Source
This commit is contained in:
Anton Khirnov 2020-12-12 14:53:30 +01:00
parent b0f1a86aaf
commit 15baa0c1ac
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/mjpegdec.c
View File

@ -172,7 +172,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
s->start_code = -1; s->start_code = -1;
s->first_picture = 1; s->first_picture = 1;
s->got_picture = 0; s->got_picture = 0;
s->org_height = avctx->coded_height; s->orig_height = avctx->coded_height;
avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER;
avctx->colorspace = AVCOL_SPC_BT470BG; avctx->colorspace = AVCOL_SPC_BT470BG;
s->hwaccel_pix_fmt = s->hwaccel_sw_pix_fmt = AV_PIX_FMT_NONE; s->hwaccel_pix_fmt = s->hwaccel_sw_pix_fmt = AV_PIX_FMT_NONE;
@ -466,8 +466,8 @@ int ff_mjpeg_decode_sof(MJpegDecodeContext *s)
/* test interlaced mode */ /* test interlaced mode */
if (s->first_picture && if (s->first_picture &&
(s->multiscope != 2 || s->avctx->time_base.den >= 25 * s->avctx->time_base.num) && (s->multiscope != 2 || s->avctx->time_base.den >= 25 * s->avctx->time_base.num) &&
s->org_height != 0 && s->orig_height != 0 &&
s->height < ((s->org_height * 3) / 4)) { s->height < ((s->orig_height * 3) / 4)) {
s->interlaced = 1; s->interlaced = 1;
s->bottom_field = s->interlace_polarity; s->bottom_field = s->interlace_polarity;
s->picture_ptr->interlaced_frame = 1; s->picture_ptr->interlaced_frame = 1;

2
libavcodec/mjpegdec.h
View File

@ -60,7 +60,7 @@ typedef struct MJpegDecodeContext {
VLC vlcs[3][4]; VLC vlcs[3][4];
int qscale[4]; ///< quantizer scale calculated from quant_matrixes int qscale[4]; ///< quantizer scale calculated from quant_matrixes
int org_height; /* size given at codec init */ int orig_height; /* size given at codec init */
int first_picture; /* true if decoding first picture */ int first_picture; /* true if decoding first picture */
int interlaced; /* true if interlaced */ int interlaced; /* true if interlaced */
int bottom_field; /* true if bottom field */ int bottom_field; /* true if bottom field */