X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fmjpegenc_common.c;h=2262de60bdd7e34f486c1b3c4a4305927cb83286;hb=cbebc3251bc2544b469e0dcb176bc04779d8866c;hp=54df9878e96305abe137d405455dc75355c0823f;hpb=7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615;p=ffmpeg diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index 54df9878e96..2262de60bdd 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) */