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.h | |
| 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.h')
| -rw-r--r-- | libavcodec/mjpegenc_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegenc_common.h b/libavcodec/mjpegenc_common.h index b48911e364..9b5933e057 100644 --- a/libavcodec/mjpegenc_common.h +++ b/libavcodec/mjpegenc_common.h @@ -28,7 +28,7 @@ #include "put_bits.h" void ff_mjpeg_encode_picture_header(AVCodecContext *avctx, PutBitContext *pb, - ScanTable *intra_scantable, + ScanTable *intra_scantable, int pred, uint16_t intra_matrix[64]); void ff_mjpeg_encode_picture_trailer(PutBitContext *pb, int header_bits); void ff_mjpeg_encode_stuffing(PutBitContext *pbc); |