CVS change done by Richard Felker CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv24164 Modified Files: mencoder.c cfg-mencoder.h Log Message: MEncoder multiple files patch by Oded Shimon (ods15) Seems to work, or at least not to cause problems with existing functionality (encoding single files). Please test and report bugs, if there are any! Index: mencoder.c =================================================================== RCS file: /cvsroot/mplayer/main/mencoder.c,v retrieving revision 1.264 retrieving revision 1.265 diff -u -r1.264 -r1.265 --- mencoder.c 22 Feb 2005 15:13:27 -0000 1.264 +++ mencoder.c 25 Feb 2005 02:32:29 -0000 1.265 @@ -264,7 +264,8 @@ static char *seek_to_sec=NULL; static off_t seek_to_byte=0; -static int parse_end_at(m_option_t *conf, const char* param); +static void parse_end_at(); +static char * end_at_string=0; //static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int height); #include "get_path.c" @@ -328,6 +329,10 @@ //--------------------------------------------------------------------------- +// this function returns the absoloute time for which MEncoder will switch files or move in the file. +// so audio can be cut correctly. -1 if there is no limit. +static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v); + static int at_eof=0; static int interrupted=0; @@ -386,6 +391,9 @@ int decoded_frameno=0; int next_frameno=-1; +int curfile=0; +int prevwidth = 0; +int prevhieght = 0; ///< When different from 0, after decoding a frame, Resolution must be checked to match previous file unsigned int timer_start; @@ -482,8 +490,10 @@ vo_init_osd(); - m_entry_set_options(mconfig,&filelist[0]); - filename = filelist[0].name; +play_next_file: + m_config_push(mconfig); + m_entry_set_options(mconfig,&filelist[curfile]); + filename = filelist[curfile].name; if(!filename){ mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_MissingFilename); @@ -588,6 +598,7 @@ // set up video encoder: +if (!curfile) { // curfile is non zero when a second file is opened if (vobsub_out) { unsigned int palette[16], width, height; unsigned char tmp[3] = { 0, 0, 0 }; @@ -664,14 +675,18 @@ mux_v->codec=out_video_codec; mux_v->bih=NULL; +} sh_video->codec=NULL; sh_video->video_out=NULL; sh_video->vfilter=NULL; // fixme! switch(mux_v->codec){ case VCODEC_COPY: - if (sh_video->bih) - mux_v->bih=sh_video->bih; + if (!curfile) { + if (sh_video->bih) { + mux_v->bih=malloc(sh_video->bih->biSize); + memcpy(mux_v->bih, sh_video->bih, sh_video->bih->biSize); + } else { mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER)); @@ -683,11 +698,37 @@ mux_v->bih->biBitCount=24; // FIXME!!! mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); } + } mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_VCodecFramecopy, mux_v->bih->biWidth, mux_v->bih->biHeight, mux_v->bih->biBitCount, mux_v->bih->biCompression); + + if (curfile) { + if (sh_video->bih) { + if ((mux_v->bih->biSize != sh_video->bih->biSize) || + memcmp(mux_v->bih, sh_video->bih, sh_video->bih->biSize)) + { + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, + sh_video->bih->biWidth, sh_video->bih->biHeight, + sh_video->bih->biBitCount, sh_video->bih->biCompression); + mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch); + mencoder_exit(1,NULL); + } + } + else { + if ((mux_v->bih->biWidth != sh_video->disp_w) || + (mux_v->bih->biHeight != sh_video->disp_h) || + (mux_v->bih->biCompression != sh_video->format)) { + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_VCodecFramecopy, + sh_video->disp_w, sh_video->disp_w, 24, sh_video->format); + mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_FrameCopyFileMismatch); + mencoder_exit(1,NULL); + } + } + } break; case VCODEC_FRAMENO: + if (!curfile) { mux_v->bih=calloc(1,sizeof(BITMAPINFOHEADER)); mux_v->bih->biSize=sizeof(BITMAPINFOHEADER); mux_v->bih->biWidth=sh_video->disp_w; @@ -696,6 +737,7 @@ mux_v->bih->biBitCount=24; mux_v->bih->biCompression=mmioFOURCC('F','r','N','o'); mux_v->bih->biSizeImage=mux_v->bih->biWidth*mux_v->bih->biHeight*(mux_v->bih->biBitCount/8); + } break; default: @@ -737,6 +779,7 @@ } +if (!curfile) { /* force output fourcc to .. */ if ((force_fourcc != NULL) && (strlen(force_fourcc) >= 4)) { @@ -767,7 +810,8 @@ switch(mux_a->codec){ case ACODEC_COPY: if (sh_audio->wf){ - mux_a->wf=sh_audio->wf; + mux_a->wf=malloc(sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); + memcpy(mux_a->wf, sh_audio->wf, sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; } else { mux_a->wf = malloc(sizeof(WAVEFORMATEX)); @@ -1127,6 +1171,95 @@ signal(SIGTERM,exit_sighandler); // kill timer_start=GetTimerMS(); +} // if (!curfile) // if this was the first file. +else if (sh_audio) { + int out_format, out_bps, out_minsize, out_maxsize; + int do_init_filters = 1; + switch(mux_a->codec){ + case ACODEC_COPY: + do_init_filters = 0; + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, + mux_a->wf->wFormatTag, mux_a->wf->nChannels, mux_a->wf->nSamplesPerSec, + mux_a->wf->wBitsPerSample, mux_a->wf->nAvgBytesPerSec, mux_a->h.dwSampleSize); + if (sh_audio->wf) { + if ((mux_a->wf->wFormatTag != sh_audio->wf->wFormatTag) || + (mux_a->wf->nChannels != sh_audio->wf->nChannels) || + (mux_a->wf->nSamplesPerSec != sh_audio->wf->nSamplesPerSec)) + { + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, + sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, sh_audio->wf->nSamplesPerSec, + sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0); + mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); + mencoder_exit(1,NULL); + } + } + else { + if ((mux_a->wf->wFormatTag != sh_audio->format) || + (mux_a->wf->nChannels != sh_audio->channels) || + (mux_a->wf->nSamplesPerSec != sh_audio->samplerate)) + { + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_ACodecFramecopy, + sh_audio->wf->wFormatTag, sh_audio->wf->nChannels, sh_audio->wf->nSamplesPerSec, + sh_audio->wf->wBitsPerSample, sh_audio->wf->nAvgBytesPerSec, 0); + mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_AudioCopyFileMismatch); + mencoder_exit(1,NULL); + } + + } + break; + case ACODEC_PCM: + mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_CBRPCMAudioSelected); + out_format = (mux_a->wf->wBitsPerSample==8) ? AF_FORMAT_U8 : AF_FORMAT_S16_LE; + out_bps = mux_a->wf->wBitsPerSample/8; + out_minsize = 16384; + out_maxsize = mux_a->wf->nAvgBytesPerSec; + break; +#ifdef HAVE_MP3LAME + case ACODEC_VBRMP3: + mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MP3AudioSelected); + out_format = AF_FORMAT_S16_NE; + out_bps = 2; + out_minsize = 4608; + out_maxsize = mux_a->h.dwRate*mux_a->wf->nChannels*2; + break; +#endif +#ifdef USE_LIBAVCODEC + case ACODEC_LAVC: + out_format = AF_FORMAT_S16_NE; + out_bps = 2; + out_minsize = mux_a->h.dwSuggestedBufferSize; + out_maxsize = mux_a->h.dwSuggestedBufferSize*2; + mp_msg(MSGT_MENCODER, MSGL_V, "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n", + lavc_actx->frame_size, lavc_actx->frame_size * 2 * lavc_actx->channels, mux_a->wf->wFormatTag); + break; +#endif +#ifdef HAVE_TOOLAME + case ACODEC_TOOLAME: + out_format = AF_FORMAT_S16_NE; + out_bps = 2; + out_minsize = mux_a->h.dwSuggestedBufferSize; + out_maxsize = mux_a->h.dwSuggestedBufferSize*2; + break; +#endif + } + if (do_init_filters) if(!init_audio_filters(sh_audio, + sh_audio->samplerate, + sh_audio->channels, + sh_audio->sample_format, + sh_audio->samplesize, + mux_a->wf->nSamplesPerSec, + mux_a->wf->nChannels, + AF_FORMAT_S16_NE, + 2, + 4608, + mux_a->h.dwRate*mux_a->wf->nChannels*2)) + { + mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter); + exit(1); + } +} + +parse_end_at(); if (seek_to_sec) { int a,b; float d; @@ -1166,6 +1299,7 @@ } play_n_frames=play_n_frames_mf; +if (curfile && end_at_type == END_AT_TIME) end_at += mux_v->timer; while(!at_eof){ @@ -1178,7 +1312,7 @@ int skip_flag=0; // 1=skip -1=duplicate if((end_at_type == END_AT_SIZE && end_at <= ftello(muxer_f)) || - (end_at_type == END_AT_TIME && end_at < sh_video->timer)) + (end_at_type == END_AT_TIME && end_at < mux_v->timer)) break; if(play_n_frames>=0){ @@ -1246,15 +1380,23 @@ #endif if(mux_a->h.dwSampleSize){ // CBR - copy 0.5 sec of audio + // or until the end of video: + float tottime = stop_time(demuxer, mux_v); + if (tottime != -1) { + tottime -= mux_a->timer; + if (tottime > 1./audio_density) tottime = 1./audio_density; + } + else tottime = 1./audio_density; + switch(mux_a->codec){ case ACODEC_COPY: // copy - len=mux_a->wf->nAvgBytesPerSec/audio_density; + len=mux_a->wf->nAvgBytesPerSec*tottime; len/=mux_a->h.dwSampleSize;if(len<1) len=1; len*=mux_a->h.dwSampleSize; len=demux_read_data(sh_audio->ds,mux_a->buffer,len); break; case ACODEC_PCM: - len=mux_a->h.dwSampleSize*(mux_a->h.dwRate/audio_density); + len=mux_a->h.dwSampleSize*(int)(mux_a->h.dwRate*tottime); len=dec_audio(sh_audio,mux_a->buffer,len); break; } @@ -1326,6 +1468,9 @@ audiosamples++; audiorate+= (GetTimerMS() - ptimer_start); + + // let's not output more audio than necessary + if (stop_time(demuxer, mux_v) != -1 && stop_time(demuxer, mux_v) <= mux_a->timer) break; } } @@ -1405,6 +1550,15 @@ // decode_video will callback down to ve_*.c encoders, through the video filters blit_frame=decode_video(sh_video,start,in_size, skip_flag>0 && (!sh_video->vfilter || ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE)); + + if (prevwidth) { + if ((mux_v->bih->biWidth != prevwidth) || (mux_v->bih->biHeight != prevhieght)) { + mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_ResolutionDoesntMatch); + mencoder_exit(1,NULL); + } + prevhieght = prevwidth = 0; + } + if(!blit_frame){ badframes++; if(skip_flag<=0){ @@ -1585,6 +1739,18 @@ VFCTRL_FLUSH_FRAMES, 0); } +if (!interrupted && filelist[++curfile].name != 0) { + if(sh_video){ uninit_video(sh_video);sh_video=NULL; } + if(demuxer) free_demuxer(demuxer); + if(stream) free_stream(stream); // kill cache thread + + prevwidth = mux_v->bih->biWidth; + prevhieght = mux_v->bih->biHeight; + + m_config_pop(mconfig); + goto play_next_file; +} + #ifdef HAVE_MP3LAME // fixup CBR mp3 audio header: if(sh_audio && mux_a->codec==ACODEC_VBRMP3 && !lame_param_vbr){ @@ -1640,10 +1806,11 @@ return interrupted; } -static int parse_end_at(m_option_t *conf, const char* param) +static void parse_end_at() { end_at_type = END_AT_NONE; + if (!end_at_string) return; /* End at size parsing */ { @@ -1651,7 +1818,7 @@ end_at_type = END_AT_SIZE; - if(sscanf(param, "%lf%3s", &end_at, unit) == 2) { + if(sscanf(end_at_string, "%lf%3s", &end_at, unit) == 2) { if(!strcasecmp(unit, "b")) ; else if(!strcasecmp(unit, "kb")) @@ -1673,20 +1840,15 @@ end_at_type = END_AT_TIME; - if (sscanf(param, "%d:%d:%f", &a, &b, &d) == 3) + if (sscanf(end_at_string, "%d:%d:%f", &a, &b, &d) == 3) end_at = 3600*a + 60*b + d; - else if (sscanf(param, "%d:%f", &a, &d) == 2) + else if (sscanf(end_at_string, "%d:%f", &a, &d) == 2) end_at = 60*a + d; - else if (sscanf(param, "%f", &d) == 1) + else if (sscanf(end_at_string, "%f", &d) == 1) end_at = d; else end_at_type = END_AT_NONE; } - - if(end_at_type == END_AT_NONE) - return ERR_FUNC_ERR; - - return 1; } #if 0 @@ -1867,3 +2029,10 @@ } #endif +static float stop_time(demuxer_t* demuxer, muxer_stream_t* mux_v) { + // demuxer is for future support for EDL + float timeleft = -1; + if (play_n_frames >= 0) timeleft = mux_v->timer + play_n_frames * (double)(mux_v->h.dwScale) / mux_v->h.dwRate; + if (end_at_type == END_AT_TIME && (timeleft > end_at || timeleft == -1)) timeleft = end_at; + return timeleft; +} Index: cfg-mencoder.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- cfg-mencoder.h 22 Feb 2005 21:27:58 -0000 1.92 +++ cfg-mencoder.h 25 Feb 2005 02:32:29 -0000 1.93 @@ -198,44 +198,44 @@ m_option_t mencoder_opts[]={ /* name, pointer, type, flags, min, max */ - {"endpos", parse_end_at, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, + {"endpos", &end_at_string, CONF_TYPE_STRING, 0, 0, 0, NULL}, // set output framerate - recommended for variable-FPS (ASF etc) files // and for 29.97FPS progressive MPEG2 streams - {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, - {"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN|CONF_GLOBAL, 0, 0, NULL}, + {"o", &out_filename, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, // limit number of skippable frames after a non-skipped one {"skiplimit", &skip_limit, CONF_TYPE_INT, 0, 0, 0, NULL}, {"noskiplimit", &skip_limit, CONF_TYPE_FLAG, 0, 0, -1, NULL}, {"noskip", &skip_limit, CONF_TYPE_FLAG, 0, 0, 0, NULL}, - {"audio-density", &audio_density, CONF_TYPE_INT, CONF_RANGE, 1, 50, NULL}, - {"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE, 0, 2, NULL}, - {"audio-delay", &audio_delay, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, + {"audio-density", &audio_density, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 1, 50, NULL}, + {"audio-preload", &audio_preload, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0, 2, NULL}, + {"audio-delay", &audio_delay, CONF_TYPE_FLOAT, CONF_MIN|CONF_GLOBAL, 0, 0, NULL}, {"x", "-x is obsolete, use -vf scale=w:h for scaling.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"xsize", "-xsize is obsolete, use -vf crop=w:h:x:y for cropping.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // output audio/video codec selection - {"oac", oac_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"oac", oac_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"ovc", ovc_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, // output file format - {"of", of_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"of", of_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, // override FOURCC in output file - {"ffourcc", &force_fourcc, CONF_TYPE_STRING, 0, 4, 4, NULL}, + {"ffourcc", &force_fourcc, CONF_TYPE_STRING, CONF_GLOBAL, 4, 4, NULL}, // override avi aspect autodetection - {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, + {"force-avi-aspect", &avi_aspect_override, CONF_TYPE_FLOAT, CONF_RANGE|CONF_GLOBAL, 0.2, 3.0, NULL}, {"pass", "-pass is obsolete, use -lavcopts vpass=n, -xvidencopts pass=n, -divx4opts pass=n\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"passlogfile", &passtmpfile, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"passlogfile", &passtmpfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, - {"vobsubout", &vobsub_out, CONF_TYPE_STRING, 0, 0, 0, NULL}, - {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE, 0, 31, NULL}, - {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"vobsubout", &vobsub_out, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, + {"vobsuboutindex", &vobsub_out_index, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 31, NULL}, + {"vobsuboutid", &vobsub_out_id, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, {"autoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noautoexpand", &auto_expand, CONF_TYPE_FLAG, 0, 1, 0, NULL}, @@ -243,42 +243,42 @@ {"encodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noencodedups", &encode_duplicates, CONF_TYPE_FLAG, 0, 1, 0, NULL}, - {"odml", &write_odml, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"noodml", &write_odml, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"odml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"noodml", &write_odml, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, // info header strings - {"info", info_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"info", info_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #ifdef HAVE_DIVX4ENCORE - {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #ifdef HAVE_MP3LAME - {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #ifdef USE_LIBAVCODEC - {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"lavcopts", lavcopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #else {"lavcopts", "MPlayer was compiled without libavcodec. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef HAVE_TOOLAME - {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"toolameopts", toolameopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #else {"toolameopts", "MPlayer was compiled without libtoolame. See README or DOCS.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, #endif #ifdef USE_WIN32DLL - {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"vfwopts", vfwopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #if defined(HAVE_XVID3) || defined(HAVE_XVID4) - {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"xvidencopts", xvidencopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #if defined(HAVE_X264) - {"x264encopts", x264encopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"x264encopts", x264encopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif - {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"nuvopts", nuvopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, + {"mpegopts", mpegopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #ifdef USE_LIBAVFORMAT - {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, + {"lavfopts", lavfopts_conf, CONF_TYPE_SUBCONFIG, CONF_GLOBAL, 0, 0, NULL}, #endif #define MAIN_CONF