diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-11-09 03:15:06 +0100 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2016-01-21 15:33:19 -0500 |
| commit | 2862b63783b5556f7f3fb2d097629bc6879f833a (patch) | |
| tree | 990909a954f2ce1a6cd5ed5f7e94c305426b5b66 /libavcodec/mjpegenc_common.c | |
| parent | 243df1351d2d928caa084a5704ed783f0b83f072 (diff) | |
| download | ffmpeg-2862b63783b5556f7f3fb2d097629bc6879f833a.tar.gz | |
lavc: Move prediction_method to codec private options
This options is only used by huffyuv, ffvhuv, jpegls, mjpeg,
mpegvideoenc, png, utvideo.
It is a very codec-specific options, so deprecate the global variant.
Set proper limits to the maximum allowed values, and update utvideoenc
tests to use the new option name.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavcodec/mjpegenc_common.c')
| -rw-r--r-- | libavcodec/mjpegenc_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 54df9878e9..2262de60bd 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -134,7 +134,7 @@ static void jpeg_put_comments(AVCodecContext *avctx, PutBitContext *p) } void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, - ScanTable *intra_scantable, + ScanTable *intra_scantable, int pred, uint16_t intra_matrix[64]) { int chroma_h_shift, chroma_v_shift; @@ -217,7 +217,7 @@ void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, put_bits(pb, 4, 1); /* DC huffman table index */ put_bits(pb, 4, lossless ? 0 : 1); /* AC huffman table index */ - put_bits(pb, 8, lossless ? avctx->prediction_method + 1 : 0); /* Ss (not used) */ + put_bits(pb, 8, lossless ? pred : 0); /* Ss (not used) */ switch (avctx->codec_id) { case AV_CODEC_ID_MJPEG: put_bits(pb, 8, 63); break; /* Se (not used) */ |