diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-11 09:15:59 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-02-11 09:15:59 +0000 |
| commit | 97654ce7f3c6f711b270487d2f43f70c8e872024 (patch) | |
| tree | 0f1114905f0bf07ce11c72ef8e2b650a17715e29 /libmpdemux/demux_mf.c | |
| parent | 8db2a741bbe904bdc7068bec4dca9a92625c1c45 (diff) | |
| download | mpv-97654ce7f3c6f711b270487d2f43f70c8e872024.tar.bz2 mpv-97654ce7f3c6f711b270487d2f43f70c8e872024.tar.xz | |
add initial mPNG support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4657 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/demux_mf.c')
| -rw-r--r-- | libmpdemux/demux_mf.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libmpdemux/demux_mf.c b/libmpdemux/demux_mf.c index e594a1e557..c416882986 100644 --- a/libmpdemux/demux_mf.c +++ b/libmpdemux/demux_mf.c @@ -76,7 +76,7 @@ demuxer_t* demux_open_mf(demuxer_t* demuxer){ // go back to the beginning stream_reset(demuxer->stream); - stream_seek(demuxer->stream, 0); +// stream_seek(demuxer->stream, 0); demuxer->movi_start = 0; demuxer->movi_end = mf->nr_of_files - 1; dmf->nr_of_frames= mf->nr_of_files; @@ -93,9 +93,11 @@ demuxer_t* demux_open_mf(demuxer_t* demuxer){ // video_read_properties() will choke sh_video->ds = demuxer->video; - if ( !strcasecmp( mf_type,"jpg" ) || - !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G'); - else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; } + if ( !strcasecmp( mf_type,"jpg" ) || + !(strcasecmp(mf_type, "jpeg"))) sh_video->format = mmioFOURCC('M', 'J', 'P', 'G'); + else + if ( !strcasecmp( mf_type,"png" )) sh_video->format = mmioFOURCC('M', 'P', 'N', 'G' ); + else { mp_msg(MSGT_DEMUX, MSGL_INFO, "[demux_mf] unknow input file type.\n" ); free( dmf ); return NULL; } sh_video->disp_w = mf_w; sh_video->disp_h = mf_h; |