diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-28 07:52:34 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-28 07:52:34 +0000 |
| commit | e86ecdac038fe0aef5ef2dc58296307e1f00184b (patch) | |
| tree | 1bcd517e0b0289166389ef91a93ae32ebd570cb5 /libmpcodecs | |
| parent | 4d08f30d253511bd82db88a9666db6f6cc0de861 (diff) | |
| download | mpv-e86ecdac038fe0aef5ef2dc58296307e1f00184b.tar.bz2 mpv-e86ecdac038fe0aef5ef2dc58296307e1f00184b.tar.xz | |
Reuse the keyframe flag from x264 instead of trying to derive it on our own.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/ve_x264.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/libmpcodecs/ve_x264.c b/libmpcodecs/ve_x264.c index 8674cd8d9e..3f149f6de6 100644 --- a/libmpcodecs/ve_x264.c +++ b/libmpcodecs/ve_x264.c @@ -258,10 +258,7 @@ 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?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); } |