[Mplayer-cvslog] CVS: main cfg-mplayer.h,1.23,1.24 mplayer.c,1.69,1.70
GEREOFFY
arpi_esp at users.sourceforge.net
Mon Apr 16 01:21:12 CEST 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv26481
Modified Files:
cfg-mplayer.h mplayer.c
Log Message:
I really hope that you will learn how to use cvs, sooner or later...
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** cfg-mplayer.h 2001/04/15 23:10:05 1.23
--- cfg-mplayer.h 2001/04/15 23:21:10 1.24
***************
*** 13,24 ****
struct config conf[]={
! /* name, pointer, type, flags, min, max */
! {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
! {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
! {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
! {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},
! {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
#ifdef HAVE_FBDEV
{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
--- 13,22 ----
struct config conf[]={
! /* name, pointer, type, flags, min, max */
! {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
! {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
! {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
#ifdef HAVE_FBDEV
{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
***************
*** 29,85 ****
{"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0},
#endif
! {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
! {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
! {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
! {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
! {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
! {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0},
! {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1},
! {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
! {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! // {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
! {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
! {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
! {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0},
! {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0},
! {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1},
! {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0},
! {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1},
! {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0},
! {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1},
! {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0},
! {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! // {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0},
! // {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0},
! {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10},
! {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0},
! {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6},
! {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99},
! {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
CONF_TYPE_PRINT, 0, 0, 0},
! {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
! {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
! {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
! {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
! {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
{"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
{"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
! {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
! {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
{"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1},
{"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
!
{"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
!
! {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
! {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
! {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},
! {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0},
! {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {NULL, NULL, 0, 0, 0, 0}
};
--- 27,83 ----
{"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0},
#endif
! {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
! {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
! {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
! {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
! {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
! {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0},
! {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1},
! {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
! {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! // {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
! {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
! {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
! {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0},
! {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0},
! {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1},
! {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0},
! {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1},
! {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0},
! {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1},
! {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0},
! {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! // {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0},
! // {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0},
! {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10},
! {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0},
! {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6},
! {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99},
! {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
CONF_TYPE_PRINT, 0, 0, 0},
! {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
! {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
! {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
! {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
! {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
{"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
{"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
! {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
! {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
{"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1},
{"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
!
{"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
!
! {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
! {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
! {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},
! {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0},
! {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! {NULL, NULL, 0, 0, 0, 0}
};
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** mplayer.c 2001/04/15 22:34:09 1.69
--- mplayer.c 2001/04/15 23:21:10 1.70
***************
*** 89,93 ****
//**************************************************************************//
! // .SUB
//**************************************************************************//
--- 89,93 ----
//**************************************************************************//
! // .SUB
//**************************************************************************//
***************
*** 128,154 ****
static int cfg_include(struct config *conf, char *filename){
! return parse_config_file(conf, filename);
}
char *get_path(char *filename){
! char *homedir;
! char *buff;
! static char *config_dir = "/.mplayer";
! int len;
!
! if ((homedir = getenv("HOME")) == NULL)
! return NULL;
! len = strlen(homedir) + strlen(config_dir) + 1;
! if (filename == NULL) {
! if ((buff = (char *) malloc(len)) == NULL)
! return NULL;
! sprintf(buff, "%s%s", homedir, config_dir);
! } else {
! len += strlen(filename) + 1;
! if ((buff = (char *) malloc(len)) == NULL)
! return NULL;
! sprintf(buff, "%s%s/%s", homedir, config_dir, filename);
! }
! return buff;
}
--- 128,154 ----
static int cfg_include(struct config *conf, char *filename){
! return parse_config_file(conf, filename);
}
char *get_path(char *filename){
! char *homedir;
! char *buff;
! static char *config_dir = "/.mplayer";
! int len;
!
! if ((homedir = getenv("HOME")) == NULL)
! return NULL;
! len = strlen(homedir) + strlen(config_dir) + 1;
! if (filename == NULL) {
! if ((buff = (char *) malloc(len)) == NULL)
! return NULL;
! sprintf(buff, "%s%s", homedir, config_dir);
! } else {
! len += strlen(filename) + 1;
! if ((buff = (char *) malloc(len)) == NULL)
! return NULL;
! sprintf(buff, "%s%s/%s", homedir, config_dir, filename);
! }
! return buff;
}
***************
*** 275,280 ****
// callback, the opendivx decoder calls this for each frame:
void convert_linux(unsigned char *puc_y, int stride_y,
! unsigned char *puc_u, unsigned char *puc_v, int stride_uv,
! unsigned char *bmp, int width_y, int height_y){
// printf("convert_yuv called %dx%d stride: %d,%d\n",width_y,height_y,stride_y,stride_uv);
--- 275,280 ----
// callback, the opendivx decoder calls this for each frame:
void convert_linux(unsigned char *puc_y, int stride_y,
! unsigned char *puc_u, unsigned char *puc_v, int stride_uv,
! unsigned char *bmp, int width_y, int height_y){
// printf("convert_yuv called %dx%d stride: %d,%d\n",width_y,height_y,stride_y,stride_uv);
***************
*** 283,287 ****
opendivx_src[1]=puc_u;
opendivx_src[2]=puc_v;
!
opendivx_stride[0]=stride_y;
opendivx_stride[1]=stride_uv;
--- 283,287 ----
opendivx_src[1]=puc_u;
opendivx_src[2]=puc_v;
!
opendivx_stride[0]=stride_y;
opendivx_stride[1]=stride_uv;
***************
*** 431,438 ****
float sub_fps=0;
//int user_bpp=0;
! extern int vo_dbpp;
! // --- NEW
! #include "mixer.h"
! // ---
#include "cfg-mplayer.h"
--- 431,435 ----
float sub_fps=0;
//int user_bpp=0;
!
#include "cfg-mplayer.h"
***************
*** 474,478 ****
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");
--- 471,475 ----
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");
***************
*** 561,565 ****
stream_read_dword_le(demuxer->stream); //filesize
id=stream_read_dword_le(demuxer->stream); // "AVI "
! if(id==formtypeAVI){
printf("Detected AVI file format!\n");
file_format=DEMUXER_TYPE_AVI;
--- 558,562 ----
stream_read_dword_le(demuxer->stream); //filesize
id=stream_read_dword_le(demuxer->stream); // "AVI "
! if(id==formtypeAVI){
printf("Detected AVI file format!\n");
file_format=DEMUXER_TYPE_AVI;
***************
*** 645,649 ****
}
demuxer->endpos=avi_header.movi_end;
!
if(avi_header.idx_size>0){
// check that file is non-interleaved:
--- 642,646 ----
}
demuxer->endpos=avi_header.movi_end;
!
if(avi_header.idx_size>0){
// check that file is non-interleaved:
***************
*** 675,679 ****
printf("Detected NON-INTERLEAVED AVI file-format!\n");
demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
! pts_from_bps=1; // force BPS sync!
}
}
--- 672,676 ----
printf("Detected NON-INTERLEAVED AVI file-format!\n");
demuxer->type=DEMUXER_TYPE_AVI_NI; // HACK!!!!
! pts_from_bps=1; // force BPS sync!
}
}
***************
*** 683,689 ****
printf("Using NON-INTERLEAVED Broken AVI file-format!\n");
demuxer->type=DEMUXER_TYPE_AVI_NINI; // HACK!!!!
! avi_header.idx_pos_a=
! avi_header.idx_pos_v=avi_header.movi_start;
! pts_from_bps=1; // force BPS sync!
}
}
--- 680,686 ----
printf("Using NON-INTERLEAVED Broken AVI file-format!\n");
demuxer->type=DEMUXER_TYPE_AVI_NINI; // HACK!!!!
! avi_header.idx_pos_a=
! avi_header.idx_pos_v=avi_header.movi_start;
! pts_from_bps=1; // force BPS sync!
}
}
***************
*** 911,915 ****
exit(1);
}
!
if(out_fmt==IMGFMT_YUY2)
DS_VideoDecoder_SetDestFmt(16,mmioFOURCC('Y', 'U', 'Y', '2'));
--- 908,912 ----
exit(1);
}
!
if(out_fmt==IMGFMT_YUY2)
DS_VideoDecoder_SetDestFmt(16,mmioFOURCC('Y', 'U', 'Y', '2'));
***************
*** 922,926 ****
printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",divx_quality) );
// printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) );
!
if(verbose) printf("INFO: Win32/DShow video codec init OK!\n");
break;
--- 919,923 ----
printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",divx_quality) );
// printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) );
!
if(verbose) printf("INFO: Win32/DShow video codec init OK!\n");
break;
***************
*** 1047,1051 ****
fflush(stdout);
!
//================== MAIN: ==========================
{
--- 1044,1048 ----
fflush(stdout);
!
//================== MAIN: ==========================
{
***************
*** 1296,1300 ****
if(1)
while(v_frame<a_frame || force_redraw){
!
float frame_time=1;
float pts1=d_video->pts;
--- 1293,1297 ----
if(1)
while(v_frame<a_frame || force_redraw){
!
float frame_time=1;
float pts1=d_video->pts;
***************
*** 1315,1321 ****
// let's decode
dec_frame.length = in_size;
! dec_frame.bitstream = start;
! dec_frame.render_flag = 1;
! decore(0x123, 0, &dec_frame, NULL);
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
--- 1312,1318 ----
// let's decode
dec_frame.length = in_size;
! dec_frame.bitstream = start;
! dec_frame.render_flag = 1;
! decore(0x123, 0, &dec_frame, NULL);
t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f;
***************
*** 1353,1356 ****
--- 1350,1354 ----
if(in_size<0){ eof=1;break;}
if(in_size>max_framesize) max_framesize=in_size;
+
if(in_size){
sh_video->bih->biSizeImage = in_size;
***************
*** 1392,1408 ****
else if(!i){ eof=1; break;} // EOF
}
! if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1;
if(!read_video_packet(d_video)){ eof=1; break;} // EOF
//printf("read packet 0x%X, len=%d\n",i,videobuf_len);
}
!
if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug
//printf("--- SEND %d bytes\n",videobuf_len);
! if(grab_frames==1){
! FILE *f=fopen("grab.mpg","ab");
! fwrite(videobuffer,videobuf_len-4,1,f);
! fclose(f);
! }
!
t-=GetTimer();
mpeg2_decode_data(video_out, videobuffer, videobuffer+videobuf_len);
--- 1390,1406 ----
else if(!i){ eof=1; break;} // EOF
}
! if(grab_frames==2 && (i==0x1B3 || i==0x1B8)) grab_frames=1;
if(!read_video_packet(d_video)){ eof=1; break;} // EOF
//printf("read packet 0x%X, len=%d\n",i,videobuf_len);
}
!
if(videobuf_len>max_framesize) max_framesize=videobuf_len; // debug
//printf("--- SEND %d bytes\n",videobuf_len);
! if(grab_frames==1){
! FILE *f=fopen("grab.mpg","ab");
! fwrite(videobuffer,videobuf_len-4,1,f);
! fclose(f);
! }
!
t-=GetTimer();
mpeg2_decode_data(video_out, videobuffer, videobuffer+videobuf_len);
***************
*** 1415,1419 ****
sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code];
}
!
frame_time=(100+picture->repeat_count)*0.01f;
picture->repeat_count=0;
--- 1413,1417 ----
sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code];
}
!
frame_time=(100+picture->repeat_count)*0.01f;
picture->repeat_count=0;
***************
*** 1528,1532 ****
#endif
getch2(20)<=0 && mplayer_get_key()<=0){
! video_out->check_events();
}
osd_function=OSD_PLAY;
--- 1526,1530 ----
#endif
getch2(20)<=0 && mplayer_get_key()<=0){
! video_out->check_events();
}
osd_function=OSD_PLAY;
***************
*** 1581,1598 ****
osd_level=(osd_level+1)%3;
break;
- // --- NEW
- case '*':
- mixer_incvolume();
- break;
- case '/':
- mixer_decvolume();
- break;
- case 'm':
- mixer_usemaster=1;
- break;;
- case 'c':
- mixer_usemaster=0;
- break;
- // ---
}
if(rel_seek_secs)
--- 1579,1582 ----
***************
*** 1606,1610 ****
if(has_audio) ds_free_packs(d_audio);
ds_free_packs(d_video);
!
// printf("sh_audio->a_buffer_len=%d \n",sh_audio->a_buffer_len);
sh_audio->a_buffer_len=0;
--- 1590,1594 ----
if(has_audio) ds_free_packs(d_audio);
ds_free_packs(d_video);
!
// printf("sh_audio->a_buffer_len=%d \n",sh_audio->a_buffer_len);
sh_audio->a_buffer_len=0;
***************
*** 1618,1622 ****
int audio_chunk_pos=-1;
int video_chunk_pos=d_video->pos;
!
skip_video_frames=0;
--- 1602,1606 ----
int audio_chunk_pos=-1;
int video_chunk_pos=d_video->pos;
!
skip_video_frames=0;
***************
*** 1738,1742 ****
// skip_audio_bytes=bytes to skip from that chunk
// skip_audio_secs=time to play audio before video (if can't skip)
!
// calc skip_video_frames & adjust video pts counter:
// i=last;
--- 1722,1726 ----
// skip_audio_bytes=bytes to skip from that chunk
// skip_audio_secs=time to play audio before video (if can't skip)
!
// calc skip_video_frames & adjust video pts counter:
// i=last;
***************
*** 1752,1756 ****
++i;
}
!
}
--- 1736,1740 ----
++i;
}
!
}
***************
*** 1785,1789 ****
}
break;
!
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS: {
--- 1769,1773 ----
}
break;
!
case DEMUXER_TYPE_MPEG_ES:
case DEMUXER_TYPE_MPEG_PS: {
***************
*** 1819,1823 ****
d_audio->pts=0; // PTS is outdated because of the raw data skipping
}
!
current_module="resync_audio";
--- 1803,1807 ----
d_audio->pts=0; // PTS is outdated because of the raw data skipping
}
!
current_module="resync_audio";
***************
*** 1844,1848 ****
if(d_video->pts && d_audio->pts){
if (d_video->pts < d_audio->pts){
!
} else {
while(d_video->pts > d_audio->pts){
--- 1828,1832 ----
if(d_video->pts && d_audio->pts){
if (d_video->pts < d_audio->pts){
!
} else {
while(d_video->pts > d_audio->pts){
***************
*** 1886,1890 ****
// for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
// vo_osd_text=osd_text_buffer;
!
// find sub
if(subtitles){
--- 1870,1874 ----
// for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
// vo_osd_text=osd_text_buffer;
!
// find sub
if(subtitles){
_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog
More information about the MPlayer-cvslog
mailing list