MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e'

Browse Source 
* commit '10a9149de242c7bbc4e130d3d7c593b89e20f80e':
  ffv1enc: Keep coded_frame.key_frame a write-only variable

Conflicts:
	libavcodec/ffv1.h
	libavcodec/ffv1enc.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-20 22:25:53 +02:00
commit b97e3e11a9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ffv1.h
View File

@ -87,6 +87,7 @@ typedef struct FFV1Context {
int transparency;
int flags;
int picture_number;
int key_frame;
ThreadFrame picture, last_picture;
struct FFV1Context *fsrc;

10
libavcodec/ffv1enc.c
View File

@ -1138,7 +1138,7 @@ static int encode_slice(AVCodecContext *c, void *arg)
}
retry:
if (c->coded_frame->key_frame)
if (f->key_frame)
ffv1_clear_slice_state(f, fs);
if (f->version > 2) {
encode_slice_header(f, fs);
@ -1260,12 +1260,12 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (avctx->gop_size == 0 || f->picture_number % avctx->gop_size == 0) {
put_rac(c, &keystate, 1);
avctx->coded_frame->key_frame = 1;
f->key_frame = 1;
f->gob_count++;
write_header(f);
} else {
put_rac(c, &keystate, 0);
avctx->coded_frame->key_frame = 0;
f->key_frame = 0;
}
if (f->ac > 1) {
@ -1318,11 +1318,13 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
if (avctx->flags & CODEC_FLAG_PASS1)
avctx->stats_out[0] = '\0';
avctx->coded_frame->key_frame = f->key_frame;
f->picture_number++;
pkt->size = buf_p - pkt->data;
pkt->pts =
pkt->dts = pict->pts;
pkt->flags |= AV_PKT_FLAG_KEY * avctx->coded_frame->key_frame;
pkt->flags |= AV_PKT_FLAG_KEY * f->key_frame;
*got_packet = 1;
return 0;