# HG changeset patch # User reimar # Date 1267343123 0 # Node ID 7ac542b9ca240434ae89112506814f30140ca374 # Parent 7092b8fc23f4e3d4d8866136ea7315bcba174d90 Use the KEYFRAME define instead of some magic number. diff -r 7092b8fc23f4 -r 7ac542b9ca24 libmpcodecs/ve_x264.c --- a/libmpcodecs/ve_x264.c Sun Feb 28 03:26:18 2010 +0000 +++ b/libmpcodecs/ve_x264.c Sun Feb 28 07:45:23 2010 +0000 @@ -263,7 +263,7 @@ && param.i_frame_reference == 1 && !param.i_bframe); 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; diff -r 7092b8fc23f4 -r 7ac542b9ca24 mencoder.c --- a/mencoder.c Sun Feb 28 03:26:18 2010 +0000 +++ b/mencoder.c Sun Feb 28 07:45:23 2010 +0000 @@ -1222,7 +1222,7 @@ } } if(len<=0) break; // EOF? - muxer_write_chunk(mux_a,len,0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + muxer_write_chunk(mux_a,len,AVIIF_KEYFRAME, MP_NOPTS_VALUE, MP_NOPTS_VALUE); if(!mux_a->h.dwSampleSize && mux_a->timer>0) mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR) if(mux_a->buffer_len>=len){ @@ -1308,11 +1308,11 @@ switch(mux_v->codec){ case VCODEC_COPY: mux_v->buffer=frame_data.start; - if(skip_flag<=0) muxer_write_chunk(mux_v,frame_data.in_size,(sh_video->ds->flags&1)?0x10:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + if(skip_flag<=0) muxer_write_chunk(mux_v,frame_data.in_size,(sh_video->ds->flags&1)?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE); break; case VCODEC_FRAMENO: mux_v->buffer=(unsigned char *)&decoded_frameno; // tricky - if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),0x10, MP_NOPTS_VALUE, MP_NOPTS_VALUE); + if(skip_flag<=0) muxer_write_chunk(mux_v,sizeof(int),AVIIF_KEYFRAME, MP_NOPTS_VALUE, MP_NOPTS_VALUE); break; default: // decode_video will callback down to ve_*.c encoders, through the video filters