Update of /cvsroot/mplayer/main In directory usw-pr-cvs1:/tmp/cvs-serv4271 Modified Files: mplayer.c Log Message: more cleanup Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -r1.56 -r1.57 *** mplayer.c 2001/04/14 15:25:10 1.56 --- mplayer.c 2001/04/14 17:08:31 1.57 *************** *** 524,528 **** //============ Open & Sync stream and detect file format =============== ! if(has_audio==0) audio_id=-2; // do NOT read audio packets... //=============== Try to open as AVI file: ================= --- 524,528 ---- //============ Open & Sync stream and detect file format =============== ! if(!has_audio) audio_id=-2; // do NOT read audio packets... //=============== Try to open as AVI file: ================= *************** *** 797,801 **** } // switch(file_format) ! if(verbose) printf("file successfully opened (has_audio=%d)\n",has_audio); printf("[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", --- 797,801 ---- } // switch(file_format) ! //if(verbose) printf("file successfully opened (has_audio=%d)\n",has_audio); printf("[V] filefmt:%d fourcc:0x%X size:%dx%d fps:%5.2f ftime:=%6.4f\n", *************** *** 815,819 **** } else { printf("Found audio codec: [%s] drv:%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info); ! has_audio=sh_audio->codec->driver; } } --- 815,819 ---- } else { printf("Found audio codec: [%s] drv:%d (%s)\n",sh_audio->codec->name,sh_audio->codec->driver,sh_audio->codec->info); ! //has_audio=sh_audio->codec->driver; } } *************** *** 841,855 **** printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info); - //if(user_bpp)printf("Trying user defined depth of %dbpp\n", user_bpp); - for(i=0;i<CODECS_MAX_OUTFMT;i++){ out_fmt=sh_video->codec->outfmt[i]; ! // if(vo_dbpp){ ! // if( ((out_fmt & IMGFMT_BGR_MASK) == IMGFMT_BGR) && ((out_fmt & 0xff) == vo_dbpp) || (out_fmt & IMGFMT_BGR_MASK) != IMGFMT_BGR){ ! // if(video_out->query_format(out_fmt)) break; ! // } ! // }else{ ! if(video_out->query_format(out_fmt)) break; ! // } } if(i>=CODECS_MAX_OUTFMT){ --- 841,847 ---- printf("Found video codec: [%s] drv:%d (%s)\n",sh_video->codec->name,sh_video->codec->driver,sh_video->codec->info); for(i=0;i<CODECS_MAX_OUTFMT;i++){ out_fmt=sh_video->codec->outfmt[i]; ! if(video_out->query_format(out_fmt)) break; } if(i>=CODECS_MAX_OUTFMT){ _______________________________________________ Mplayer-cvslog mailing list Mplayer-cvslog@lists.sourceforge.net http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog