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.
Unified · Split
| @@ -2606,19 +2606,12 @@ eoi_parser: · 2605 unmodified lines | ||
| 2606 | 2606 | |
| 2607 | 2607 | frame->pkt_dts = s->pkt->dts; |
| 2608 | 2608 | |
| 2609 | − if (!s->lossless) { | |
| 2609 | + if (!s->lossless && avctx->debug & FF_DEBUG_QP) { | |
| 2610 | 2610 | int qp = FFMAX3(s->qscale[0], |
| 2611 | 2611 | s->qscale[1], |
| 2612 | 2612 | s->qscale[2]); |
| 2613 | − int qpw = (s->width + 15) / 16; | |
| 2614 | − AVBufferRef *qp_table_buf = av_buffer_alloc(qpw); | |
| 2615 | − if (qp_table_buf) { | |
| 2616 | − memset(qp_table_buf->data, qp, qpw); | |
| 2617 | − av_frame_set_qp_table(frame, qp_table_buf, 0, FF_QSCALE_TYPE_MPEG1); | |
| 2618 | − } | |
| 2619 | 2613 | |
| 2620 | − if(avctx->debug & FF_DEBUG_QP) | |
| 2621 | − av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp); | |
| 2614 | + av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", qp); | |
| 2622 | 2615 | } |
| 2623 | 2616 | |
| 2624 | 2617 | goto the_end; |
| @@ -29,12 +29,6 @@ color_transfer=unknown · 28 unmodified lines | ||
| 29 | 29 | chroma_location=center |
| 30 | 30 | TAG:UserComment=AppleMark |
| 31 | 31 | |
| 32 | −[SIDE_DATA] | |
| 33 | −side_data_type=QP table data | |
| 34 | −[/SIDE_DATA] | |
| 35 | −[SIDE_DATA] | |
| 36 | −side_data_type=QP table properties | |
| 37 | −[/SIDE_DATA] | |
| 38 | 32 | [/FRAME] |
| 39 | 33 | [FRAME] |
| 40 | 34 | media_type=audio |
| @@ -229,10 +229,4 @@ TAG:ExposureMode= 0 · 228 unmodified lines | ||
| 229 | 229 | TAG:WhiteBalance= 0 |
| 230 | 230 | TAG:DigitalZoomRatio= 4000:4000 |
| 231 | 231 | TAG:SceneCaptureType= 0 |
| 232 | −[SIDE_DATA] | |
| 233 | −side_data_type=QP table data | |
| 234 | −[/SIDE_DATA] | |
| 235 | −[SIDE_DATA] | |
| 236 | −side_data_type=QP table properties | |
| 237 | −[/SIDE_DATA] | |
| 238 | 232 | [/FRAME] |