diff options
| author | Anton Khirnov <anton@khirnov.net> | 2020-12-12 14:53:30 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2021-01-01 14:33:47 +0100 |
| commit | 15baa0c1acd21be99408e6782ae28d868b847b13 (patch) | |
| tree | 2987c75e6f29fb6292fad20778fb56e1b34ebd34 | |
| parent | b0f1a86aaf0b360e2d2cd84aceee1e3264c7e7e5 (diff) | |
| download | ffmpeg-15baa0c1acd21be99408e6782ae28d868b847b13.tar.gz | |
lavc/mjpegdec: cosmetics, org->orig
| -rw-r--r-- | libavcodec/mjpegdec.c | 6 | ||||
| -rw-r--r-- | libavcodec/mjpegdec.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 11fb809c10..f2ce82fc5f 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -172,7 +172,7 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx) s->start_code = -1; s->first_picture = 1; s->got_picture = 0; - s->org_height = avctx->coded_height; + s->orig_height = avctx->coded_height; avctx->chroma_sample_location = AVCHROMA_LOC_CENTER; avctx->colorspace = AVCOL_SPC_BT470BG; 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 */ if (s->first_picture && (s->multiscope != 2 || s->avctx->time_base.den >= 25 * s->avctx->time_base.num) && - s->org_height != 0 && - s->height < ((s->org_height * 3) / 4)) { + s->orig_height != 0 && + s->height < ((s->orig_height * 3) / 4)) { s->interlaced = 1; s->bottom_field = s->interlace_polarity; s->picture_ptr->interlaced_frame = 1; diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index fcbe58bcb8..a824b5029c 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -60,7 +60,7 @@ typedef struct MJpegDecodeContext { VLC vlcs[3][4]; 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 interlaced; /* true if interlaced */ int bottom_field; /* true if bottom field */ |