mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'
* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f': libtheoraenc: Keep coded_frame.key_frame a write-only variable Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
commit
bde7f5b135
@ -350,7 +350,7 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt,
|
||||
// multithreaded (which will be disabled unless explicitly requested)
|
||||
pkt->pts = pkt->dts = frame->pts;
|
||||
avc_context->coded_frame->key_frame = !(o_packet.granulepos & h->keyframe_mask);
|
||||
if (avc_context->coded_frame->key_frame)
|
||||
if (!(o_packet.granulepos & h->keyframe_mask))
|
||||
pkt->flags |= AV_PKT_FLAG_KEY;
|
||||
*got_packet = 1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user