diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:36:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-20 22:36:22 +0200 |
| commit | 439c9760b046caaffceacc08c40692f2e8cb3f03 (patch) | |
| tree | 601736a193305ce4ed31d11cc32a25ed12a14c19 | |
| parent | 5cc3faf6198b881e2f0aa65ac72aa2671e5b015b (diff) | |
| parent | 91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf (diff) | |
| download | ffmpeg-439c9760b046caaffceacc08c40692f2e8cb3f03.tar.gz | |
Merge commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf'
* commit '91f9b6579ac684c4b51c4cd0dbaed0a4f8295edf':
flashsvenc: Keep coded_frame.key_frame a write-only variable
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/flashsvenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flashsvenc.c b/libavcodec/flashsvenc.c index acbc13482a..f56a995895 100644 --- a/libavcodec/flashsvenc.c +++ b/libavcodec/flashsvenc.c @@ -271,7 +271,7 @@ static int flashsv_encode_frame(AVCodecContext *avctx, AVPacket *pkt, avctx->coded_frame->key_frame = 0; } - if (avctx->coded_frame->key_frame) + if (I_frame) pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; |