Mercurial > mplayer.hg

comparison libmpdemux/demux_mf.c @ 4656:04880518728d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add initial mPNG support
author pontscho
date Mon, 11 Feb 2002 09:15:59 +0000
parents e09b1a5b464d
children ef8a43b74075
comparison
equal deleted inserted replaced
4655:364cf7cc77be 4656:04880518728d
74 mf=(mf_t*)demuxer->stream->priv; 74 mf=(mf_t*)demuxer->stream->priv;
75 dmf=calloc( 1,sizeof( demuxer_mf_t ) ); 75 dmf=calloc( 1,sizeof( demuxer_mf_t ) );
76 76
77 // go back to the beginning 77 // go back to the beginning
78 stream_reset(demuxer->stream); 78 stream_reset(demuxer->stream);
79 stream_seek(demuxer->stream, 0); 79 // stream_seek(demuxer->stream, 0);
80 demuxer->movi_start = 0; 80 demuxer->movi_start = 0;
81 demuxer->movi_end = mf->nr_of_files - 1; 81 demuxer->movi_end = mf->nr_of_files - 1;
82 dmf->nr_of_frames= mf->nr_of_files; 82 dmf->nr_of_frames= mf->nr_of_files;
83 dmf->curr_frame=0; 83 dmf->curr_frame=0;
84 84
91 // make sure that the video demuxer stream header knows about its 91 // make sure that the video demuxer stream header knows about its
92 // parent video demuxer stream (this is getting wacky), or else 92 // parent video demuxer stream (this is getting wacky), or else
93 // video_read_properties() will choke 93 // video_read_properties() will choke
94 sh_video->ds = demuxer->video; 94 sh_video->ds = demuxer->video;
95 95
96 if ( !strcasecmp( mf_type,"jpg" ) || 96 if ( !strcasecmp( mf_type,"jpg" ) ||
97 !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G'); 97 !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G');
98 else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; } 98 else
99 if ( !strcasecmp( mf_type,"png" )) sh_video->format = mmioFOURCC('M', 'P', 'N', 'G' );
100 else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; }
99 101
100 sh_video->disp_w = mf_w; 102 sh_video->disp_w = mf_w;
101 sh_video->disp_h = mf_h; 103 sh_video->disp_h = mf_h;
102 sh_video->fps = mf_fps; 104 sh_video->fps = mf_fps;
103 sh_video->frametime = 1 / sh_video->fps; 105 sh_video->frametime = 1 / sh_video->fps;