Message ID | PR3PR03MB6665CFCED49857BEC4951E148FD59@PR3PR03MB6665.eurprd03.prod.outlook.com |
---|---|
State | Accepted |
Commit | 9348d06fc640289294f288f6a683bf86a32c8db1 |
Headers | show |
Series | [FFmpeg-devel,01/14] Revert "avfilter/af_silenceremove: fix processing of periods > 1" | expand |
Context | Check | Description |
---|---|---|
andriy/make_x86 | success | Make finished |
andriy/make_fate_x86 | success | Make fate finished |
andriy/make_ppc | success | Make finished |
andriy/make_fate_ppc | success | Make fate finished |
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index bd4e8fd8cd..3ae496bc56 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1590,23 +1590,7 @@ int ff_qsv_encode(AVCodecContext *avctx, QSVEncContext *q, av_freep(&bs); av_freep(&sync); - if (pkt->data) { - if (pkt->size < new_pkt.size) { - av_log(avctx, AV_LOG_ERROR, "Submitted buffer not large enough: %d < %d\n", - pkt->size, new_pkt.size); - av_packet_unref(&new_pkt); - return AVERROR(EINVAL); - } - - memcpy(pkt->data, new_pkt.data, new_pkt.size); - pkt->size = new_pkt.size; - - ret = av_packet_copy_props(pkt, &new_pkt); - av_packet_unref(&new_pkt); - if (ret < 0) - return ret; - } else - *pkt = new_pkt; + av_packet_move_ref(pkt, &new_pkt); *got_packet = 1; }
Dead since commit 93016f5d1d280f9cb7856883af287fa66affc04c which ensured that the packets received by encoders are always blank. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/qsvenc.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)