diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-11-27 17:04:06 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-11-28 10:34:10 +0100 |
| commit | 08c367465b78c3317abdfd7706c831dba19f86ea (patch) | |
| tree | f8780f5dab897b1fa5eb0a98d3f51f6a7a83dccc | |
| parent | bbf4d11edc8d5b35a446bd8d02e5ee7f197d6669 (diff) | |
lavc/adxenc: support AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE
| -rw-r--r-- | libavcodec/adxenc.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c index e1bf344b01..9e0ceb61eb 100644 --- a/libavcodec/adxenc.c +++ b/libavcodec/adxenc.c @@ -185,6 +185,18 @@ static int adx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, avpkt->pts = frame->pts; avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); + + if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) { + avpkt->opaque = frame->opaque; + if (frame->opaque_ref) { + avpkt->opaque_ref = av_buffer_ref(frame->opaque_ref); + if (!avpkt->opaque_ref) + return AVERROR(ENOMEM); + } + } + + avctx->reordered_opaque = frame->reordered_opaque; + *got_packet_ptr = 1; return 0; } @@ -194,7 +206,8 @@ const FFCodec ff_adpcm_adx_encoder = { CODEC_LONG_NAME("SEGA CRI ADX ADPCM"), .p.type = AVMEDIA_TYPE_AUDIO, .p.id = AV_CODEC_ID_ADPCM_ADX, - .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, + .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY | + AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE, .priv_data_size = sizeof(ADXContext), .init = adx_encode_init, FF_CODEC_ENCODE_CB(adx_encode_frame), |