aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2022-07-12 14:37:15 +0200
committerAnton Khirnov <anton@khirnov.net>2023-01-29 09:23:17 +0100
commit2bb20e98ba74ca629fd63d7b1fc3154ea1f3caa5 (patch)
tree208f6528ffbcb82fcdef42d1a8515105b9da310b
parentb7f0c8889e022c6fbfd9703664f8af05d9a48258 (diff)
downloadffmpeg-2bb20e98ba74ca629fd63d7b1fc3154ea1f3caa5.tar.gz
lavc/libtheoraenc: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE
-rw-r--r--libavcodec/libtheoraenc.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c
index da16c6372e..73295e22b9 100644
--- a/libavcodec/libtheoraenc.c
+++ b/libavcodec/libtheoraenc.c
@@ -347,6 +347,12 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt,
// HACK: assumes no encoder delay, this is true until libtheora becomes
// multithreaded (which will be disabled unless explicitly requested)
pkt->pts = pkt->dts = frame->pts;
+ pkt->duration = frame->duration;
+
+ ret = ff_encode_reordered_opaque(avc_context, pkt, frame);
+ if (ret < 0)
+ return ret;
+
if (!(o_packet.granulepos & h->keyframe_mask))
pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1;
@@ -373,7 +379,9 @@ const FFCodec ff_libtheora_encoder = {
.p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_THEORA,
.p.capabilities = AV_CODEC_CAP_DR1 |
- AV_CODEC_CAP_DELAY /* for statsfile summary */,
+ /* for statsfile summary */
+ AV_CODEC_CAP_DELAY |
+ AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE,
.priv_data_size = sizeof(TheoraContext),
.init = encode_init,