diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:13:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:13:42 +0200 |
| commit | bde7f5b135c772e0122fd5df616e6de46e157167 (patch) | |
| tree | d4356978b249b3361c193f94046a6dfc9bd6a668 /libavcodec/libtheoraenc.c | |
| parent | 96504b3f72a7fad602fbbb06d85633c52ceaf8da (diff) | |
| parent | f3b4a92241a33d444f7f6018ebc12e2e3a2d335f (diff) | |
Merge commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f'
* commit 'f3b4a92241a33d444f7f6018ebc12e2e3a2d335f':
libtheoraenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/libtheoraenc.c')
| -rw-r--r-- | libavcodec/libtheoraenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/libtheoraenc.c b/libavcodec/libtheoraenc.c index e6b1cbd2ed..ff681f3243 100644 --- a/libavcodec/libtheoraenc.c +++ b/libavcodec/libtheoraenc.c @@ -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; |