diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:44:59 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-01-28 16:44:59 +0000 |
| commit | 0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e (patch) | |
| tree | 144c6e7680198c13152d9cdd704c972f640a0216 /libavcodec/libxvid.c | |
| parent | b986a4625d0e67710f155a9816dbab186a98020e (diff) | |
| parent | 12b49769223234673db1003d9c43e7483ceb0282 (diff) | |
| download | ffmpeg-0e3e3656d31a7e1e595ccb5ca3acfc76a23d785e.tar.gz | |
Merge commit '12b49769223234673db1003d9c43e7483ceb0282'
* commit '12b49769223234673db1003d9c43e7483ceb0282':
lavc: Move mpeg_quant to codec private options
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/libxvid.c')
| -rw-r--r-- | libavcodec/libxvid.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/libxvid.c b/libavcodec/libxvid.c index 94fd053f3c..6fd4e162c1 100644 --- a/libavcodec/libxvid.c +++ b/libavcodec/libxvid.c @@ -84,6 +84,7 @@ struct xvid_context { int ssim_acc; /**< SSIM accuracy. 0: accurate. 4: fast. */ int gmc; int me_quality; /**< Motion estimation quality. 0: fast 6: best. */ + int mpeg_quant; /**< Quantization type. 0: H263, 1: MPEG */ }; /** @@ -641,7 +642,15 @@ FF_ENABLE_DEPRECATION_WARNINGS /* Quant Matrices */ x->intra_matrix = x->inter_matrix = NULL; + +#if FF_API_PRIVATE_OPT +FF_DISABLE_DEPRECATION_WARNINGS if (avctx->mpeg_quant) + x->mpeg_quant = avctx->mpeg_quant; +FF_ENABLE_DEPRECATION_WARNINGS +#endif + + if (x->mpeg_quant) x->vol_flags |= XVID_VOL_MPEGQUANT; if ((avctx->intra_matrix || avctx->inter_matrix)) { x->vol_flags |= XVID_VOL_MPEGQUANT; @@ -890,6 +899,7 @@ static const AVOption options[] = { { "ssim_acc", "SSIM accuracy", OFFSET(ssim_acc), AV_OPT_TYPE_INT, { .i64 = 2 }, 0, 4, VE }, { "gmc", "use GMC", OFFSET(gmc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "me_quality", "Motion estimation quality", OFFSET(me_quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 6, VE }, + { "mpeg_quant", "Use MPEG quantizers instead of H.263", OFFSET(mpeg_quant), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { NULL }, }; |