February 2004 - MPlayer-G2-dev - lists.mplayerhq.hu

10 Mar '04

Hi, Ok, it seems that the codec/filter developers are against dual licensing. Not a big surprise :) So, I'm restricting dual license mess to the stream/demuxer layer only. The audio/video pipeline (including codecs, filters, ao/vo) will remain free. Why? Most of the possible licensers are using hardware decoders, so they don't need the ap/vp stuff anyway. And if they need sw codecs, they can still buy libdivx and libmad (both are available for commercial licensing). Maybe i'll even implement a sample program using stream/demux layers only and libdivx+libmad for decoding (maybe using minimal fbdev or xv output code for display). Also, they mostly want to modify stream/demux code only, not the vp/ap stuff. So they can do their propietrary changes (ie. encrypted streaming, authentication, pay-per-view, secret fileformat etc) to it and link the GPL mplayer-g2 to the modified closedsource demuxer lib. (dunno if GPL really allows linking of closedsource libs, but if it isnt then we're already in trouble with codec DLLs, libdivx and others) As you refusers (Michael, Rich) don't develop demuxers anyway, it shouldn't hurt you. It may hurt Albeu, but who cares? :) (sorry) A'rpi / Astral & ESP-team -- Developer of MPlayer G2, the Movie Framework for all - http://www.MPlayerHQ.hu

19 59

specifing visual for X11 window
by Reimar Döffinger 29 Feb '04

29 Feb '04

Hello, I've been working on an OpenGL vo module for G2. What I need is a way to make sure the window that is passed to the config function is usable for OpenGL. The best idea I had so far was adding a XVisualInfo* part to vo_instance_t and if it's set the window will be created using this visual. Would this be acceptable / do you have any other ideas (except creating the window in the vo module, this would give the same mess as in G1). Greetings, Reimar Döffinger

2 2

Legal issues: would companies really pay?
by Gustavo Sverzut Barbieri 25 Feb '04

25 Feb '04

Hello, Gabuccino is really sure companies will pay for mplayer licenses. Would they? Imagine mplayer license the core under BSD to them... to make it worth, it need to be a good amount of money, since we want to help developers AND have a fund to fight lawsuits. Now this company find some bugs and fixes them, no code back to mplayer. Then a second company comes along and instead of licensing from mplayer, it licenses from the company who licensed from mplayer, for 90% of the price and with bugfixes. The company who first licensed could even start to port from current mplayer to its own copy, they will be stealing, but as they have some licensed parts, it will be difficult to prove to non-tech people (court) that they did steal code. In a even worst scenario, the second company maybe didn't know mplayer, bought the code and later discover mplayer and argue someone is giving the same code they bought for free (GPL version) and make a real mess. So, together with other points argued by Rich and Rik, 2-licenses will not help at all. I liked Rich's idea of MPlayer developers being employed to help improve mplayer, or customize it, etc... so they could have some money. In the worst case, we should have the core licensed under LGPL, so the damn-closed codecs (like pay-per-view, etc) could use their non-free modules linked with mplayer. But we need to know how many devs will want this, how many want to make a living from mplayer this way and stuff like this. Maybe you are elluded with the success mplayer have? MPlayer success maybe make you thougth: Wow, what a piece of software! Many other software are really worse than it and make money, shoudn't I make money from it? Well, you really should make some money from it, it's really a excellent piece of software, but the money should come other way than that. And you should know (I know you know) that main reason for mplayer success is being FREE, being OPEN [FOREVER], being GPL. Maybe if you were BSD, many users wouldn't send you code, collaborating to other project instead. MPlayer was bought to play things made by enterprise who care nothing about us, people. You devs worked hard and now your player is the best cost/benefit out there and they want your code, should you give it to them? So what, they will put more bad things in the world so then you will reverse-engineer the whole thing to be able to play it? Gustavo ______________________________________________________________________ Yahoo! Mail - O melhor e-mail do Brasil! Abra sua conta agora: http://br.yahoo.com/info/mail.html

3 3

[PATCH] vo_x11_fullscreen check width and height
by Reimar Döffinger 23 Feb '04

23 Feb '04

Hello, I want to propose the following patch that makes sure that the window width and height are set to values != 0 I think this would be helpfull as X errors are a bit hard to track down (at least I needed some time to find it), and additionally it will 'fix' vo_gl2 until I get around to really fix it (which starts directly in fullscreen mode and thus vo_old_width and vo_old_height aren't set). Comments are welcome. Greetings, Reimar Döffinger Index: x11_common.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v retrieving revision 1.162 diff -u -r1.162 x11_common.c --- x11_common.c 16 Jan 2004 17:31:37 -0000 1.162 +++ x11_common.c 23 Feb 2004 20:31:50 -0000 @@ -1040,6 +1040,11 @@ if(vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight) return; vo_fs=VO_FALSE; x=vo_old_x; y=vo_old_y; w=vo_old_width; h=vo_old_height; + if (w == 0 || h == 0) { // otherwise we will get a SIGABORT + mp_msg(MSGT_VO, MSGL_ERR, "[x11_common] bad window size!\n"); + w = (vo_dwidth)?vo_dwidth:50; + h = (vo_dheight)?vo_dheight:50; + } } else { // win->fs if(vo_old_width &&

2 2

dual licensing
by Arpi 23 Feb '04

23 Feb '04

Hi, I know some of you refuse such things by reflex, including me. But we should consider it in case of g2, at least for the core code and stream/demuxer layer (at least for main formats). Why? There are many companies using mplayer g1 in closed products. Either by stealing it silently (KiSS etc) or by calling it via the slavemode interface so not hurting the gpl. The rest of them just wants to use g1, but for some reason they can't accept gpl, and we can't accept non-gpl, so they don't use it (or fallback to stealing code). Some of them would even sponsor or pay mplayer team/developers for implementing custom features for them. (some actually do, who accept the custom changes to be released) As G2 is planned to be *the* media api (!= CWJ's media-api) in a few years, we should provide a way to limited users to use the core legally. They can choose, between free (as beer) under gpl, or for money under a bsd-like license (which allows them to link into closed source code). Even if we refuse this way, only we loose. Why? They will either - steal code, for free, ignoring gpl - use other 'products', like libavifile, media-api, gstreamer etc. which (may) allow other licensing form for us I have no experience in such licensing/legal mess, but what I plan to reach: - free use under GPL, _or_ - use with a paid custom license, something similar to BSD one (allows linking to closed src products, but keep credits) We don't have to dual-license all of the g2 code/files. only the core library files (including special modules, like vo_null, vf_vo2) and some of the basic plugins (like demux_avi, demux_mpeg, vf_scale, vf_expand etc) mostly required for any use. A'rpi / Astral & ESP-team -- Developer of MPlayer G2, the Movie Framework for all - http://www.MPlayerHQ.hu

9 31

CVS: g2/audio dec_audio.c,1.1.1.1,1.2
by syncmail＠mplayerhq.hu 22 Feb '04

22 Feb '04

CVS change done by Arpi of Ize Update of /cvsroot/mplayer/g2/audio In directory mail:/var2/tmp/cvs-serv28061/audio Modified Files: dec_audio.c Log Message: - demuxer: changed PTS handling, export native PTS (based on rate_m/rate_d) instead of scaled up by rate_m - demux_avi: fixed nobps sync mode, when video chunkc come before audio ones - demux_mpg: div native pts by 4, to fit 33 bits pts into 31 bits (signed int) Index: dec_audio.c =================================================================== RCS file: /cvsroot/mplayer/g2/audio/dec_audio.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- dec_audio.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ dec_audio.c 22 Feb 2004 16:19:07 -0000 1.2 @@ -417,7 +417,8 @@ float d=(sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; float d2=(sh_audio->ds->flags&DEMUX_STREAM_FLAG_PTS_FOR_BLOCK) ? 0.0 : (dl2/(float)sh_audio->i_bps); - sh_audio->pts=(double)sh_audio->ds->pts/(double)sh_audio->ds->rate_m + d2 - d; + sh_audio->pts=(double)sh_audio->ds->pts*(double)sh_audio->ds->rate_d/(double)sh_audio->ds->rate_m + d2 - d; +// printf("ZZZ a_pts=%8.8f\n",(float)sh_audio->pts); mp_msg(MSGT_AVSYNC,MSGL_DBG2,"dec_audio: a_pts=%8.3f+%5.3f-%5.3f=%8.3f [+%d-%d] \n", (float)sh_audio->ds->pts,d2,d,(float)sh_audio->pts, dl2, sh_audio->a_in_buffer_len); sh_audio->ds->pts=0;

2 1

CVS: g2/video vd_libmpeg2.c, 1.1.1.1, 1.2 vf_vd.c, 1.1.1.1, 1.2
by syncmail＠mplayerhq.hu 22 Feb '04

22 Feb '04

CVS change done by Arpi of Ize Update of /cvsroot/mplayer/g2/video In directory mail:/var2/tmp/cvs-serv28061/video Modified Files: vd_libmpeg2.c vf_vd.c Log Message: - demuxer: changed PTS handling, export native PTS (based on rate_m/rate_d) instead of scaled up by rate_m - demux_avi: fixed nobps sync mode, when video chunkc come before audio ones - demux_mpg: div native pts by 4, to fit 33 bits pts into 31 bits (signed int) Index: vd_libmpeg2.c =================================================================== RCS file: /cvsroot/mplayer/g2/video/vd_libmpeg2.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- vd_libmpeg2.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ vd_libmpeg2.c 22 Feb 2004 16:19:07 -0000 1.2 @@ -209,7 +209,8 @@ mpi->qstride=info->sequence->picture_width>>4; #endif if((info->display_picture->flags&PIC_FLAG_PTS)){ - mpi->pts=(double)info->display_picture->pts/(double)sh->ds->rate_m; + mpi->pts=(double)((int)info->display_picture->pts)*(double)sh->ds->rate_d/(double)sh->ds->rate_m; +// printf("ZZZ v_pts=%8.8f\n",(float)mpi->pts); if(delay_flag) mpi->pts-=info->sequence->frame_period/(2*2*27000000.0); mpi->pts_flags|=MP_PTSFLAG_PTS_AVAIL; } Index: vf_vd.c =================================================================== RCS file: /cvsroot/mplayer/g2/video/vf_vd.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- vf_vd.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ vf_vd.c 22 Feb 2004 16:19:07 -0000 1.2 @@ -61,7 +61,7 @@ in_size=ds_get_packet(vf->priv->sh->ds,&start); if(in_size<0) return NULL; // demux error / EOF if(sh->ds->pts_packs==0) // we have fresh pts - pts=(double)sh->ds->pts/(double)sh->ds->rate_m; + pts=(double)sh->ds->pts*(double)sh->ds->rate_d/(double)sh->ds->rate_m; } if(sh->ds->rate_m) frametime=(float)sh->ds->rate_d/(float)sh->ds->rate_m;

1 0

[MPlayer-G2-dev] CVS: g2/demux demux_asf.c, 1.1.1.1, 1.2 demux_avi.c, 1.4, 1.5 demux_mpeg.c, 1.1.1.1, 1.2 demux_ogg.c, 1.2, 1.3
by syncmail＠mplayerhq.hu 22 Feb '04

22 Feb '04

CVS change done by Arpi of Ize Update of /cvsroot/mplayer/g2/demux In directory mail:/var2/tmp/cvs-serv28061/demux Modified Files: demux_asf.c demux_avi.c demux_mpeg.c demux_ogg.c Log Message: - demuxer: changed PTS handling, export native PTS (based on rate_m/rate_d) instead of scaled up by rate_m - demux_avi: fixed nobps sync mode, when video chunkc come before audio ones - demux_mpg: div native pts by 4, to fit 33 bits pts into 31 bits (signed int) Index: demux_asf.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_asf.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- demux_asf.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ demux_asf.c 22 Feb 2004 16:19:07 -0000 1.2 @@ -440,7 +440,7 @@ switch(ASF_LOAD_GUID_PREFIX(streamh.type)){ case ASF_GUID_PREFIX_audio_stream: { demux_stream_t* ds=new_demuxer_stream(demuxer,streamh.stream_no & 0x7F,DEMUX_STREAM_TYPE_AUDIO); - ds->rate_m=1000; // PTS is 1/1000 seconds based + ds->rate_d=1;ds->rate_m=1000; // PTS is 1/1000 seconds based ds->priv=calloc(sizeof(struct demux_stream_priv_s),1); ds->ms_header_size=(streamh.type_size<sizeof(WAVEFORMATEX))?sizeof(WAVEFORMATEX):streamh.type_size; ds->ms_header=calloc(ds->ms_header_size,1); @@ -464,7 +464,7 @@ case ASF_GUID_PREFIX_video_stream: { demux_stream_t* ds=new_demuxer_stream(demuxer,streamh.stream_no & 0x7F,DEMUX_STREAM_TYPE_VIDEO); unsigned int len=streamh.type_size-(4+4+1+2); - ds->rate_m=1000; // PTS is 1/1000 seconds based + ds->rate_d=1;ds->rate_m=1000; // PTS is 1/1000 seconds based ds->priv=calloc(sizeof(struct demux_stream_priv_s),1); ds->ms_header_size=(len<sizeof(BITMAPINFOHEADER))?sizeof(BITMAPINFOHEADER):len; ds->ms_header=calloc(ds->ms_header_size,1); Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_avi.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- demux_avi.c 22 Feb 2004 00:03:56 -0000 1.4 +++ demux_avi.c 22 Feb 2004 16:19:07 -0000 1.5 @@ -68,18 +68,18 @@ float delay=0; if(ds->bitrate) delay=ds->priv->pts_corr_bytes*8/(float)ds->bitrate; - mp_msg(MSGT_DEMUX,MSGL_V,"XXX initial v_pts=%5.3f a_pos=%d (%5.3f) \n",ds->priv->avi_audio_pts,ds->priv->pts_corr_bytes,delay); //priv->pts_correction=-priv->avi_audio_pts+delay; - ds->priv->pts_correction=delay*(float)ds->rate_m-ds->priv->avi_audio_pts; - ds->priv->avi_audio_pts+=ds->priv->pts_correction; + ds->priv->pts_correction=(delay - demux->priv->avi_video_pts)*(float)ds->rate_m/(float)ds->rate_d; + mp_msg(MSGT_DEMUX,MSGL_V,"XXX initial v_pts=%5.8f a_pos=%d (%5.8f) corr=%d \n",demux->priv->avi_video_pts,ds->priv->pts_corr_bytes,delay,ds->priv->pts_correction); +// ds->priv->avi_audio_pts+=ds->priv->pts_correction; ds->priv->pts_corrected=1; } else ds->priv->pts_corr_bytes+=len; } if(pts_from_bps){ - pts = ds->priv->audio_block_no * (float)ds->rate_d; // / (float)ds->rate_m; + pts = ds->priv->audio_block_no; } else { - pts=demux->priv->avi_video_pts*(float)ds->rate_m; + pts=demux->priv->avi_video_pts*(float)ds->rate_m/(float)ds->rate_d; pts+=ds->priv->pts_correction; if(pts==ds->priv->avi_audio_pts) pts=0; @@ -101,10 +101,9 @@ ++ds->priv->video_pack_no; ds=NULL; } else { - pts = ds->priv->video_pack_no * ds->rate_d; - demux->priv->avi_video_pts = ds->priv->video_pack_no * - (float)ds->rate_d/(float)ds->rate_m; -// printf("\rYYY-V A: %5.3f V: %5.3f \n",priv->avi_audio_pts,priv->avi_video_pts); + pts = ds->priv->video_pack_no; + demux->priv->avi_video_pts = pts * (float)ds->rate_d/(float)ds->rate_m; +// printf("\rYYY-V Vpts: %5.8f \n",demux->priv->avi_video_pts); demux->priv->pts_has_video=1; ++ds->priv->video_pack_no; } @@ -118,7 +117,7 @@ if(ds && !ds->ignore){ mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_AVI: Read %d data bytes from packet %04X\n",len,id); -// printf("READ[%c] %5.3f (%d) \n",ds==demux->video?'V':'A',pts,len); +// printf("READ[%d] %d (%d) \n",ds->type,pts,len); ds_read_packet(ds,demux->stream,len,pts,idxpos,flags); skip-=len; } Index: demux_mpeg.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_mpeg.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- demux_mpeg.c 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ demux_mpeg.c 22 Feb 2004 16:19:07 -0000 1.2 @@ -140,7 +140,8 @@ ++mpeg_pts_error; return 0; // invalid pts } - pts=(((c>>1)&7)<<30)|((d>>1)<<15)|(e>>1); // 33 bits, MSB lost +// pts=(((c>>1)&7)<<30)|((d>>1)<<15)|(e>>1); // 33 bits, 1 MSB lost + pts=(((c>>1)&7)<<28)|((d>>1)<<13)|((e>>1)>>2); // 31 bits, 2 LSB lost mp_dbg(MSGT_DEMUX,MSGL_DBG3,"{%d}",pts); return pts; } @@ -354,7 +355,8 @@ if(!ds){ // register new stream! ds=new_demuxer_stream(demuxer, (pid<0) ? id : pid, type); - ds->rate_m=90000; // PTS base + ds->rate_d=1; + ds->rate_m=90000/4; // PTS base ds->format=format; ds->flags|=ds_flags; ds->priv=calloc(sizeof(struct demux_stream_priv_s),1); Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_ogg.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- demux_ogg.c 31 Jan 2004 22:27:11 -0000 1.2 +++ demux_ogg.c 22 Feb 2004 16:19:07 -0000 1.3 @@ -251,7 +251,7 @@ if(granule_pos){ // we have a pts! if(ds->rate_m) - dp->pts=(granule_pos+1)*(double)ds->rate_d; + dp->pts=(granule_pos+1); //*(double)ds->rate_d; // dp->pts=(granule_pos+1)*(double)ds->rate_d/(double)ds->rate_m; //printf("OGG: #%d %8d %5.3f\n",ds->id,(int)granule_pos,(float)dp->pts); granule_pos=0; // !!!!!!!

1 0

CVS: g2/demux demux_avi.c, 1.3, 1.4 demuxer.h, 1.1.1.1, 1.2
by syncmail＠mplayerhq.hu 22 Feb '04

22 Feb '04

CVS change done by Arpi of Ize Update of /cvsroot/mplayer/g2/demux In directory mail:/var2/tmp/cvs-serv30290 Modified Files: demux_avi.c demuxer.h Log Message: avi_stream_id() moved to the right place Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_avi.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- demux_avi.c 21 Feb 2004 22:10:52 -0000 1.3 +++ demux_avi.c 22 Feb 2004 00:03:56 -0000 1.4 @@ -41,6 +41,19 @@ // PTS: 0=interleaved 1=BPS-based int pts_from_bps=1; +static inline int avi_stream_id(unsigned int id){ + unsigned char *p=(unsigned char *)&id; + unsigned char a,b; +#if WORDS_BIGENDIAN + a=p[3]-'0'; b=p[2]-'0'; +#else + a=p[0]-'0'; b=p[1]-'0'; +#endif + if(a>9 || b>9) return 100; // invalid ID + return a*10+b; +} + + static int demux_avi_read_packet(demuxer_t *demux,demux_stream_t *ds,unsigned int id,unsigned int len,int idxpos,int flags){ int skip; int pts=0; Index: demuxer.h =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demuxer.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- demuxer.h 31 Jan 2004 20:16:18 -0000 1.1.1.1 +++ demuxer.h 22 Feb 2004 00:03:56 -0000 1.2 @@ -275,18 +275,6 @@ // This is defined here because demux_stream_t ins't defined in stream.h stream_t* new_ds_stream(demux_stream_t *ds); -static inline int avi_stream_id(unsigned int id){ - unsigned char *p=(unsigned char *)&id; - unsigned char a,b; -#if WORDS_BIGENDIAN - a=p[3]-'0'; b=p[2]-'0'; -#else - a=p[0]-'0'; b=p[1]-'0'; -#endif - if(a>9 || b>9) return 100; // invalid ID - return a*10+b; -} - //demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); demuxer_t* demux_open(stream_t *stream,char* name,int flags);

1 0

CVS: g2/demux demux_avi.c,1.2,1.3
by syncmail＠mplayerhq.hu 21 Feb '04

21 Feb '04

CVS change done by Arpi of Ize Update of /cvsroot/mplayer/g2/demux In directory mail:/var2/tmp/cvs-serv30346 Modified Files: demux_avi.c Log Message: correctly skip unknown chunks (fixes some opendml files) Index: demux_avi.c =================================================================== RCS file: /cvsroot/mplayer/g2/demux/demux_avi.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- demux_avi.c 31 Jan 2004 22:29:18 -0000 1.2 +++ demux_avi.c 21 Feb 2004 22:10:52 -0000 1.3 @@ -116,24 +116,6 @@ return ds?1:0; } -// Select ds from ID -static demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id){ - int stream_id=avi_stream_id(id); - -// printf("demux_avi_select_stream(%d) {a:%d/v:%d}\n",stream_id, -// demux->audio->id,demux->video->id); - - if(demux->streams[stream_id]) return demux->streams[stream_id]; - - if(id!=mmioFOURCC('J','U','N','K')){ - // unknown - mp_msg(MSGT_DEMUX,MSGL_DBG2,"Unknown chunk: %.4s (%X)\n",(char *) &id,id); - //abort(); - } - return NULL; -} - - // return value: // 0 = EOF or no stream found // 1 = successfully read a packet @@ -158,8 +140,7 @@ continue; } - ds=demux_avi_select_stream(demuxer,id); - if(ds){ + if((ds=demuxer->streams[avi_stream_id(id)])){ if(ds->packs+1>=MAX_PACKS || ds->bytes+len>=MAX_PACK_BYTES){ // avoid buffer overflow! switch to NI parser... mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_SwitchToNi); @@ -167,6 +148,11 @@ return -1; } ret=demux_avi_read_packet(demuxer,ds,id,len,demuxer->priv->idx_pos-1,flags); + } else { + // unknown + if(id!=mmioFOURCC('J','U','N','K')) + mp_msg(MSGT_DEMUX,MSGL_DBG2,"AVI: Unknown chunk: %.4s (%X) at 0x%X\n",(char *) &id,id, demuxer->filepos); + stream_skip(demuxer->stream,(len+1)&(~1)); } } while(ret!=1); @@ -224,7 +210,7 @@ mp_msg(MSGT_HEADER,MSGL_V,"Found movie at 0x%X - 0x%X\n",(int)demuxer->movi_start,(int)demuxer->movi_end); if(demuxer->stream->end_pos>demuxer->movi_end) demuxer->movi_end=demuxer->stream->end_pos; // if(index_mode==-2 || index_mode==2 || index_mode==0) -// break; // reading from non-seekable source (stdin) or forced index or no index forced + break; // reading from non-seekable source (stdin) or forced index or no index forced if(list_end>0) stream_seek(demuxer->stream,list_end); // skip movi list_end=0; }

1 0