mjpegdec: stop setting the QP table

MJPEG does not have a single quantiser scale, so this does not fit into
the intended API use.

This removes the last use of the long-deprecated QP table API.

diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 8876afd96671e17e042cccc006a0c51c9d50b9d9..fa4c607085cbe9ef3d5431bc3a36f17f67f48334 100644 (file)
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2606,19 +2606,12 @@ eoi_parser:
 
             frame->pkt_dts = s->pkt->dts;
 
-            if (!s->lossless) {
+            if (!s->lossless && avctx->debug & FF_DEBUG_QP) {
                 int qp = FFMAX3(s->qscale[0],
                                 s->qscale[1],
                                 s->qscale[2]);
-                int qpw = (s->width + 15) / 16;
-                AVBufferRef *qp_table_buf = av_buffer_alloc(qpw);
-                if (qp_table_buf) {
-                    memset(qp_table_buf->data, qp, qpw);
-                    av_frame_set_qp_table(frame, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1);
-                }
 
-                if(avctx->debug & FF_DEBUG_QP)
-                    av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp);
+                av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp);
             }
 
             goto the_end;

diff --git a/tests/ref/fate/exif-image-embedded b/tests/ref/fate/exif-image-embedded
index d9239b3c83ec25418fb00fb9eb57ece45456276a..9ad073e9ea30bbd1715b76cd32cc9bd08f36a0cd 100644 (file)
--- a/tests/ref/fate/exif-image-embedded
+++ b/tests/ref/fate/exif-image-embedded
@@ -29,12 +29,6 @@ color_transfer=unknown
 chroma_location=center
 TAG:UserComment=AppleMark
 
-[SIDE_DATA]
-side_data_type=QP table data
-[/SIDE_DATA]
-[SIDE_DATA]
-side_data_type=QP table properties
-[/SIDE_DATA]
 [/FRAME]
 [FRAME]
 media_type=audio

diff --git a/tests/ref/fate/exif-image-jpg b/tests/ref/fate/exif-image-jpg
index eb18dede2192542401db9332fea5e8e0b3688e57..b266501191bedf02bb3af425a01efe4d462fd11c 100644 (file)
--- a/tests/ref/fate/exif-image-jpg
+++ b/tests/ref/fate/exif-image-jpg
@@ -229,10 +229,4 @@ TAG:ExposureMode=    0
 TAG:WhiteBalance=    0
 TAG:DigitalZoomRatio=   4000:4000
 TAG:SceneCaptureType=    0
-[SIDE_DATA]
-side_data_type=QP table data
-[/SIDE_DATA]
-[SIDE_DATA]
-side_data_type=QP table properties
-[/SIDE_DATA]
 [/FRAME]