diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:14:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:35:02 +0200 |
| commit | bc1d0ca37d9bdfd69a945043650e0246ffeb5f94 (patch) | |
| tree | 8269c9cbc1df72afb5715b77669698a0781f6250 /libmpcodecs/ve_x264.c | |
| parent | f7cc4152f7c55808c5dd6bbd49c216c9345eb686 (diff) | |
| parent | e9a5e7f667d1b0c0dec0053ad9ec6f7bc3162b60 (diff) | |
| download | mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.bz2 mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.xz | |
Merge svn changes up to r30798
Diffstat (limited to 'libmpcodecs/ve_x264.c')
| -rw-r--r-- | libmpcodecs/ve_x264.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 303acdb6fe..fc7ac6c1ff 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -258,12 +258,9 @@ static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in) return -1; } if(i_size>0) { - int keyframe = (pic_out.i_type == X264_TYPE_IDR) || - (pic_out.i_type == X264_TYPE_I - && param.i_frame_reference == 1 - && !param.i_bframe); + int keyframe = pic_out.b_keyframe; memcpy(mod->mux->buffer, nal->p_payload, i_size); - muxer_write_chunk(mod->mux, i_size, keyframe?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + muxer_write_chunk(mod->mux, i_size, keyframe?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); } else ++mod->mux->encoder_delay; |