[Xbyamp-cvs] xbmp/player/mplayer af_dummy.c,1.1,1.2 ao_plugin.c,1.1,1.2 aspect.c,1.1,1.2 audio_out.c
Status: Pre-Alpha
Brought to you by:
yamp
Menu
▾
▴
[Xbyamp-cvs] xbmp/player/mplayer af_dummy.c,1.1,1.2 ao_plugin.c,1.1,1.2 aspect.c,1.1,1.2 audio_out.c,1.1,1.2 demuxer.h,1.2,1.3 find_sub.c,1.1,1.2 font_load.c,1.1,1.2 mp_image.h,1.1,1.2 spudec.c,1.1,1.2 sub.c,1.1,1.2 subreader.cpp,1.1,1.2 video_out.c,1.1,1.2 vo_aa.c,1.1,1.2 vo_md5.c,1.1,1.2 vo_null.c,1.1,1.2 vo_yuv4mpeg.c,1.1,1.2 libmpcodecs.lib,1.5,1.6 libmpdemux.lib,1.3,1.4
|
From: <ya...@us...> - 2002-12-02 18:48:13
|
Update of /cvsroot/xbyamp/xbmp/player/mplayer
In directory sc8-pr-cvs1:/tmp/cvs-serv26575/player/mplayer
Modified Files:
af_dummy.c ao_plugin.c aspect.c audio_out.c demuxer.h
find_sub.c font_load.c mp_image.h spudec.c sub.c subreader.cpp
video_out.c vo_aa.c vo_md5.c vo_null.c vo_yuv4mpeg.c
libmpcodecs.lib libmpdemux.lib
Log Message:
fixed manual a/v sync correction
Index: af_dummy.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/af_dummy.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** af_dummy.c 28 Nov 2002 21:47:32 -0000 1.1
--- af_dummy.c 2 Dec 2002 18:46:46 -0000 1.2
***************
*** 59,63 ****
// Do something necessary to get rid of annoying warning during compile
if(!af)
! printf("EEEK: Argument af == NULL in af_dummy.c play().");
return data;
}
--- 59,63 ----
// Do something necessary to get rid of annoying warning during compile
if(!af)
! mp_msg(0,0,"EEEK: Argument af == NULL in af_dummy.c play().");
return data;
}
Index: ao_plugin.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/ao_plugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ao_plugin.c 28 Nov 2002 21:47:32 -0000 1.1
--- ao_plugin.c 2 Dec 2002 18:46:48 -0000 1.2
***************
*** 88,92 ****
cnt++;
}
! printf("[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
--- 88,92 ----
cnt++;
}
! mp_msg(0,0,"[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
***************
*** 105,109 ****
cnt++;
}
! printf("[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
--- 105,109 ----
cnt++;
}
! mp_msg(0,0,"[plugin]: Invalid plugin: %s \n",cfg);
return 0;
}
Index: aspect.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/aspect.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** aspect.c 28 Nov 2002 21:47:32 -0000 1.1
--- aspect.c 2 Dec 2002 18:46:48 -0000 1.2
***************
*** 65,70 ****
#ifdef ASPECT_DEBUG
! printf("aspect(0) fitin: %dx%d zoom: %d \n",aspdat.scrw,aspdat.scrh,zoom);
! printf("aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(zoom){
--- 65,70 ----
#ifdef ASPECT_DEBUG
! mp_msg(0,0,"aspect(0) fitin: %dx%d zoom: %d \n",aspdat.scrw,aspdat.scrh,zoom);
! mp_msg(0,0,"aspect(1) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(zoom){
***************
*** 79,83 ****
*srch+= *srch%2; // round
#ifdef ASPECT_DEBUG
! printf("aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(*srch>aspdat.scrh || *srch<aspdat.orgh){
--- 79,83 ----
*srch+= *srch%2; // round
#ifdef ASPECT_DEBUG
! mp_msg(0,0,"aspect(2) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
if(*srch>aspdat.scrh || *srch<aspdat.orgh){
***************
*** 96,100 ****
mp_msg(MSGT_VO,MSGL_WARN,"aspect: Warning: no suitable new res found!\n");
#else
! printf("error: no new size found that fits into res!\n");
#endif
}
--- 96,100 ----
mp_msg(MSGT_VO,MSGL_WARN,"aspect: Warning: no suitable new res found!\n");
#else
! mp_msg(0,0,"error: no new size found that fits into res!\n");
#endif
}
***************
*** 102,106 ****
aspdat.asp=*srcw / (float)*srch;
#ifdef ASPECT_DEBUG
! printf("aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
}
--- 102,106 ----
aspdat.asp=*srcw / (float)*srch;
#ifdef ASPECT_DEBUG
! mp_msg(0,0,"aspect(3) wh: %dx%d (org: %dx%d)\n",*srcw,*srch,aspdat.prew,aspdat.preh);
#endif
}
Index: audio_out.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/audio_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** audio_out.c 28 Nov 2002 21:47:32 -0000 1.1
--- audio_out.c 2 Dec 2002 18:46:49 -0000 1.2
***************
*** 64,70 ****
{
const ao_info_t *info = audio_out_drivers[i++]->info;
! printf("\t%s\t%s\n", info->short_name, info->name);
}
! printf("\n");
}
--- 64,70 ----
{
const ao_info_t *info = audio_out_drivers[i++]->info;
! mp_msg(0,0,"\t%s\t%s\n", info->short_name, info->name);
}
! mp_msg(0,0,"\n");
}
Index: demuxer.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/demuxer.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** demuxer.h 2 Dec 2002 17:01:23 -0000 1.2
--- demuxer.h 2 Dec 2002 18:46:52 -0000 1.3
***************
*** 194,202 ****
if(ds->buffer_pos>=ds->buffer_size){
if(!ds_fill_buffer(ds)){
! // printf("DEMUX_GETC: EOF reached!\n");
return -1; // EOF
}
}
! // printf("[%02X]",ds->buffer[ds->buffer_pos]);
return ds->buffer[ds->buffer_pos++];
}
--- 194,202 ----
if(ds->buffer_pos>=ds->buffer_size){
if(!ds_fill_buffer(ds)){
! // mp_msg(0,0,"DEMUX_GETC: EOF reached!\n");
return -1; // EOF
}
}
! // mp_msg(0,0,"[%02X]",ds->buffer[ds->buffer_pos]);
return ds->buffer[ds->buffer_pos++];
}
Index: find_sub.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/find_sub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** find_sub.c 28 Nov 2002 21:47:32 -0000 1.1
--- find_sub.c 2 Dec 2002 18:46:52 -0000 1.2
***************
*** 59,63 ****
}
! // printf("\r---- sub changed ----\n");
// check next sub.
--- 59,63 ----
}
! // mp_msg(0,0,"\r---- sub changed ----\n");
// check next sub.
***************
*** 79,83 ****
}
! // printf("\r---- sub log search... ----\n");
// use logarithmic search:
--- 79,83 ----
}
! // mp_msg(0,0,"\r---- sub log search... ----\n");
// use logarithmic search:
***************
*** 85,89 ****
i=0;
j=sub_num-1;
! // printf("Searching %d in %d..%d\n",key,subtitles[i].start,subtitles[j].end);
while(j>=i)
{
--- 85,89 ----
i=0;
j=sub_num-1;
! // mp_msg(0,0,"Searching %d in %d..%d\n",key,subtitles[i].start,subtitles[j].end);
while(j>=i)
{
***************
*** 108,112 ****
nosub_range_start=key-1; // tricky
nosub_range_end=vo_sub->start;
! // printf("FIRST... key=%d end=%d \n",key,vo_sub->start);
vo_sub=NULL;
return;
--- 108,112 ----
nosub_range_start=key-1; // tricky
nosub_range_end=vo_sub->start;
! // mp_msg(0,0,"FIRST... key=%d end=%d \n",key,vo_sub->start);
vo_sub=NULL;
return;
***************
*** 118,122 ****
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // printf("No sub... 1 \n");
vo_sub=NULL;
return;
--- 118,122 ----
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // mp_msg(0,0,"No sub... 1 \n");
vo_sub=NULL;
return;
***************
*** 134,138 ****
nosub_range_start=vo_sub->end;
nosub_range_end=0x7FFFFFFF; // MAXINT
! // printf("END!?\n");
vo_sub=NULL;
return;
--- 134,138 ----
nosub_range_start=vo_sub->end;
nosub_range_end=0x7FFFFFFF; // MAXINT
! // mp_msg(0,0,"END!?\n");
vo_sub=NULL;
return;
***************
*** 144,148 ****
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // printf("No sub... 2 \n");
vo_sub=NULL;
return;
--- 144,148 ----
nosub_range_start=subtitles[current_sub].end;
nosub_range_end=subtitles[current_sub+1].start;
! // mp_msg(0,0,"No sub... 2 \n");
vo_sub=NULL;
return;
Index: font_load.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/font_load.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** font_load.c 28 Nov 2002 21:47:32 -0000 1.1
--- font_load.c 2 Dec 2002 18:46:52 -0000 1.2
***************
*** 38,42 ****
if(raw->c>256)
return NULL; // too many colors!?
! //if(verbose) printf("RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
if(raw->c)
{
--- 38,42 ----
if(raw->c>256)
return NULL; // too many colors!?
! //if(verbose) mp_msg(0,0,"RAW: %s %d x %d, %d colors\n",name,raw->w,raw->h,raw->c);
if(raw->c)
{
***************
*** 166,171 ****
*d=0;
! // printf("params=%d sor=%s\n",pdb,sor);
! // for(i=0;i<pdb;i++) printf(" param %d = '%s'\n",i,p[i]);
if(pdb==1 && p[0][0]=='[')
--- 166,171 ----
*d=0;
! // mp_msg(0,0,"params=%d sor=%s\n",pdb,sor);
! // for(i=0;i<pdb;i++) mp_msg(0,0," param %d = '%s'\n",i,p[i]);
if(pdb==1 && p[0][0]=='[')
***************
*** 298,302 ****
desc->width[chr]=end-start+1;
desc->font[chr]=fontdb;
! // printf("char %d '%c' start=%d width=%d\n",chr,chr,desc->start[chr],desc->width[chr]);
++chardb;
}
--- 298,302 ----
desc->width[chr]=end-start+1;
desc->font[chr]=fontdb;
! // mp_msg(0,0,"char %d '%c' start=%d width=%d\n",chr,chr,desc->start[chr],desc->width[chr]);
++chardb;
}
***************
*** 309,313 ****
fclose(f);
! //printf("font: pos of U = %d\n",desc->start[218]);
for(i=0;i<=fontdb;i++)
--- 309,313 ----
fclose(f);
! //mp_msg(0,0,"font: pos of U = %d\n",desc->start[218]);
for(i=0;i<=fontdb;i++)
Index: mp_image.h
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/mp_image.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mp_image.h 28 Nov 2002 21:47:32 -0000 1.1
--- mp_image.h 2 Dec 2002 18:46:56 -0000 1.2
***************
*** 180,184 ****
return;
}
! // printf("mp_image: Unknown out_fmt: 0x%X\n",out_fmt);
mpi->bpp=0;
}
--- 180,184 ----
return;
}
! // USE_SVQ1"mp_image: Unknown out_fmt: 0x%X\n",out_fmt);
mpi->bpp=0;
}
Index: spudec.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/spudec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** spudec.c 28 Nov 2002 21:47:32 -0000 1.1
--- spudec.c 2 Dec 2002 18:46:56 -0000 1.2
***************
*** 151,155 ****
first_y = fy / this->stride;
last_y = ly / this->stride;
! //printf("first_y: %d, last_y: %d\n", first_y, last_y);
this->start_row += first_y;
--- 151,155 ----
first_y = fy / this->stride;
last_y = ly / this->stride;
! //mp_msg(0,0,"first_y: %d, last_y: %d\n", first_y, last_y);
this->start_row += first_y;
***************
*** 161,165 ****
}
! //printf("new h %d new start %d (sz %d st %d)---\n\n", this->height, this->start_row, this->image_size, this->stride);
image = malloc(2 * this->stride * this->height);
--- 161,165 ----
}
! //mp_msg(0,0,"new h %d new start %d (sz %d st %d)---\n\n", this->height, this->start_row, this->image_size, this->stride);
image = malloc(2 * this->stride * this->height);
***************
*** 512,516 ****
spudec_handle_t *spu = (spudec_handle_t *)this;
int ret=(spu->start_pts <= spu->now_pts && spu->now_pts < spu->end_pts);
! // printf("spu visible: %d \n",ret);
return ret;
}
--- 512,516 ----
spudec_handle_t *spu = (spudec_handle_t *)this;
int ret=(spu->start_pts <= spu->now_pts && spu->now_pts < spu->end_pts);
! // mp_msg(0,0,"spu visible: %d \n",ret);
return ret;
}
Index: sub.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/sub.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sub.c 28 Nov 2002 21:47:32 -0000 1.1
--- sub.c 2 Dec 2002 18:46:57 -0000 1.2
***************
*** 256,260 ****
! // printf("osd.progbar width=%d xpos=%d\n",width,x);
c=vo_osd_progbar_type;
--- 256,260 ----
! // mp_msg(0,0,"osd.progbar width=%d xpos=%d\n",width,x);
c=vo_osd_progbar_type;
***************
*** 369,373 ****
len=strlen(t)-1;
! // printf("sub(%d) '%s'\n",len,t);
// if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h
// else
--- 369,373 ----
len=strlen(t)-1;
! // mp_msg(0,0,"sub(%d) '%s'\n",len,t);
// if(len<0) memy -=h; // according to max of vo_font->pic_a[font]->h
// else
***************
*** 460,464 ****
h=vo_font->height;
}
! // printf("h: %d -> %d \n",vo_font->height,h);
obj->y -=h; // according to max of vo_font->pic_a[font]->h
prevc = -1;
--- 460,464 ----
h=vo_font->height;
}
! // mp_msg(0,0,"h: %d -> %d \n",vo_font->height,h);
obj->y -=h; // according to max of vo_font->pic_a[font]->h
prevc = -1;
Index: subreader.cpp
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/subreader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** subreader.cpp 28 Nov 2002 21:47:32 -0000 1.1
--- subreader.cpp 2 Dec 2002 18:46:57 -0000 1.2
***************
*** 224,228 ****
char *p=source;
! // printf("src=%p dest=%p \n",source,dest);
while ( !eol(*p) && *p!= '|' )
--- 224,228 ----
char *p=source;
! // mp_msg(0,0,"src=%p dest=%p \n",source,dest);
while ( !eol(*p) && *p!= '|' )
***************
*** 465,469 ****
}
if (p==NULL) {
! printf("SUB: Skipping incorrect subtitle line!\n");
continue;
}
--- 465,469 ----
}
if (p==NULL) {
! mp_msg(0,0,"SUB: Skipping incorrect subtitle line!\n");
continue;
}
***************
*** 688,692 ****
{
current->text[num]=strdup(p);
! // printf (">%s<\n",p);
current->lines = ++num;
}
--- 688,692 ----
{
current->text[num]=strdup(p);
! // mp_msg(0,0,">%s<\n",p);
current->lines = ++num;
}
***************
*** 1357,1361 ****
#endif
! // printf ("SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num);
if (sub_errs)
--- 1357,1361 ----
#endif
! // mp_msg(0,0,"SUB: Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
mp_msg(MSGT_SUBREADER,MSGL_INFO,"SUB: Read %i subtitles", sub_num);
if (sub_errs)
***************
*** 1560,1564 ****
#endif
strcpy(j?aviptr1:aviptr2,sub_exts[i]);
! // printf("trying: '%s'\n",sub_name);
if((f=fopen( sub_name,"rt" )))
{
--- 1560,1564 ----
#endif
strcpy(j?aviptr1:aviptr2,sub_exts[i]);
! // mp_msg(0,0,"trying: '%s'\n",sub_name);
if((f=fopen( sub_name,"rt" )))
{
***************
*** 1584,1588 ****
{
subtitle* egysub=&subs[j];
! printf ("%i line%c (%li-%li) ",
egysub->lines,
(1==egysub->lines)?' ':'s',
--- 1584,1588 ----
{
subtitle* egysub=&subs[j];
! mp_msg(0,0,"%i line%c (%li-%li) ",
egysub->lines,
(1==egysub->lines)?' ':'s',
***************
*** 1591,1601 ****
for (i=0; i<egysub->lines; i++)
{
! printf ("%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> ");
}
! printf ("\n");
}
! printf ("Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
! printf ("Read %i subtitles, %i errors.\n", sub_num, sub_errs);
}
--- 1591,1601 ----
for (i=0; i<egysub->lines; i++)
{
! mp_msg(0,0,"%s%s",egysub->text[i], i==egysub->lines-1?"":" <BREAK> ");
}
! mp_msg(0,0,"\n");
}
! mp_msg(0,0,"Subtitle format %s time.\n", sub_uses_time?"uses":"doesn't use");
! mp_msg(0,0,"Read %i subtitles, %i errors.\n", sub_num, sub_errs);
}
***************
*** 1777,1781 ****
if(argc<2)
{
! printf("\nUsage: subreader filename.sub\n\n");
exit(1);
}
--- 1777,1781 ----
if(argc<2)
{
! mp_msg(0,0,"\nUsage: subreader filename.sub\n\n");
exit(1);
}
***************
*** 1784,1788 ****
if(!subs)
{
! printf("Couldn't load file.\n");
exit(1);
}
--- 1784,1788 ----
if(!subs)
{
! mp_msg(0,0,"Couldn't load file.\n");
exit(1);
}
Index: video_out.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/video_out.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** video_out.c 28 Nov 2002 21:47:32 -0000 1.1
--- video_out.c 2 Dec 2002 18:46:58 -0000 1.2
***************
*** 201,207 ****
while (video_out_drivers[i]) {
const vo_info_t *info = video_out_drivers[i++]->get_info ();
! printf("\t%s\t%s\n", info->short_name, info->name);
}
! printf("\n");
}
--- 201,207 ----
while (video_out_drivers[i]) {
const vo_info_t *info = video_out_drivers[i++]->get_info ();
! mp_msg(0,0,"\t%s\t%s\n", info->short_name, info->name);
}
! mp_msg(0,0,"\n");
}
***************
*** 280,284 ****
goto out_err;
if (!(r = (range_t *) realloc(r, sizeof(*r) * (i + 2)))) {
! printf("can't realloc 'r'\n");
return NULL;
}
--- 280,284 ----
goto out_err;
if (!(r = (range_t *) realloc(r, sizeof(*r) * (i + 2)))) {
! mp_msg(0,0,"can't realloc 'r'\n");
return NULL;
}
Index: vo_aa.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_aa.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_aa.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_aa.c 2 Dec 2002 18:47:00 -0000 1.2
***************
*** 694,710 ****
else if (!strcasecmp(opt, "aahelp"))
{
! printf("Here are the aalib options:\n");
help=strdup(aa_help); /* aa_help is const :( */
x=strtok(help,"-");
! printf(x);
while ((x=strtok(NULL, "-")))
{
if (*(x-2)==' ')
! printf("-aa");
else
! printf("-");
! printf("%s", x);
}
! printf(
"\n"
"\n"
--- 694,710 ----
else if (!strcasecmp(opt, "aahelp"))
{
! mp_msg(0,0,"Here are the aalib options:\n");
help=strdup(aa_help); /* aa_help is const :( */
x=strtok(help,"-");
! mp_msg(0,0,x);
while ((x=strtok(NULL, "-")))
{
if (*(x-2)==' ')
! mp_msg(0,0,"-aa");
else
! mp_msg(0,0,"-");
! mp_msg(0,0,"%s", x);
}
! mp_msg(0,0,
"\n"
"\n"
***************
*** 842,846 ****
m_config_set_flag(mconfig,"quiet",0); /* disable mplayer outputs */
/* disable console blanking */
! printf("\033[9;0]");
}
--- 842,846 ----
m_config_set_flag(mconfig,"quiet",0); /* disable mplayer outputs */
/* disable console blanking */
! mp_msg(0,0,"\033[9;0]");
}
Index: vo_md5.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_md5.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_md5.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_md5.c 2 Dec 2002 18:47:01 -0000 1.2
***************
*** 115,119 ****
if(arg)
{
! printf("vo_md5: Unknown subdevice: %s\n",arg);
return -1;
}
--- 115,119 ----
if(arg)
{
! mp_msg(0,0,"vo_md5: Unknown subdevice: %s\n",arg);
return -1;
}
Index: vo_null.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_null.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_null.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_null.c 2 Dec 2002 18:47:01 -0000 1.2
***************
*** 109,113 ****
if(arg)
{
! printf("vo_null: Unknown subdevice: %s\n",arg);
return -1;
}
--- 109,113 ----
if(arg)
{
! mp_msg(0,0,"vo_null: Unknown subdevice: %s\n",arg);
return -1;
}
Index: vo_yuv4mpeg.c
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/vo_yuv4mpeg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** vo_yuv4mpeg.c 28 Nov 2002 21:47:32 -0000 1.1
--- vo_yuv4mpeg.c 2 Dec 2002 18:47:01 -0000 1.2
***************
*** 100,104 ****
if (using_format == IMGFMT_YV12)
! printf("yuv4mpeg: WARNING: Input not RGB; Can't seperate chrominance by fields!\n");
}
--- 100,104 ----
if (using_format == IMGFMT_YV12)
! mp_msg(0,0,"yuv4mpeg: WARNING: Input not RGB; Can't seperate chrominance by fields!\n");
}
***************
*** 439,443 ****
if (arg_unrecognized == 2)
{
! printf("vo_yuv4mpeg: Unknown subdevice: %s\n", arg);
return -1;
}
--- 439,443 ----
if (arg_unrecognized == 2)
{
! mp_msg(0,0,"vo_yuv4mpeg: Unknown subdevice: %s\n", arg);
return -1;
}
***************
*** 448,458 ****
{
case Y4M_ILACE_TOP_FIRST:
! printf("vo_yuv4mpeg: Interlaced output mode, top-field first\n");
break;
case Y4M_ILACE_BOTTOM_FIRST:
! printf("vo_yuv4mpeg: Interlaced output mode, bottom-field first\n");
break;
default:
! printf("vo_yuv4mpeg: Using (default) progressive frame mode\n");
break;
}
--- 448,458 ----
{
case Y4M_ILACE_TOP_FIRST:
! mp_msg(0,0,"vo_yuv4mpeg: Interlaced output mode, top-field first\n");
break;
case Y4M_ILACE_BOTTOM_FIRST:
! mp_msg(0,0,"vo_yuv4mpeg: Interlaced output mode, bottom-field first\n");
break;
default:
! mp_msg(0,0,"vo_yuv4mpeg: Using (default) progressive frame mode\n");
break;
}
Index: libmpcodecs.lib
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpcodecs.lib,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
Binary files /tmp/cvsI793KE and /tmp/cvsKUe7hx differ
Index: libmpdemux.lib
===================================================================
RCS file: /cvsroot/xbyamp/xbmp/player/mplayer/libmpdemux.lib,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
Binary files /tmp/cvsJY9fLj and /tmp/cvsQaBohz differ
|
