Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'

* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
  libtheoraenc: Keep coded_frame.key_frame a write-only variable

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
pull/140/head
Michael Niedermayer 10 years ago
commit bde7f5b135
  1. 2
      libavcodec/libtheoraenc.c

@ -350,7 +350,7 @@ static int encode_frame(AVCodecContext* avc_context, AVPacket *pkt,
// multithreaded (which will be disabled unless explicitly requested) // multithreaded (which will be disabled unless explicitly requested)
pkt->pts = pkt->dts = frame->pts; pkt->pts = pkt->dts = frame->pts;
avc_context->coded_frame->key_frame = !(o_packet.granulepos & h->keyframe_mask); 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; pkt->flags |= AV_PKT_FLAG_KEY;
*got_packet = 1; *got_packet = 1;

Loading…
Cancel
Save