diff options
| author | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-11 16:48:48 +0000 |
|---|---|---|
| committer | michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-04-11 16:48:48 +0000 |
| commit | 532af04dba498a92c90be42e63660324f369620f (patch) | |
| tree | 2717e17b81fc64ade939fa14ca38918abe9f44f4 /libmpdemux | |
| parent | d854c5c06a45b04c8abb7e84b267b00a59a01a7d (diff) | |
| download | mpv-532af04dba498a92c90be42e63660324f369620f.tar.bz2 mpv-532af04dba498a92c90be42e63660324f369620f.tar.xz | |
avoid unneeded stream_reset()
aspect ratio support (rarely works ...)
author, title, ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12168 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_lavf.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/libmpdemux/demux_lavf.c b/libmpdemux/demux_lavf.c index 1a92212385..51beb09fab 100644 --- a/libmpdemux/demux_lavf.c +++ b/libmpdemux/demux_lavf.c @@ -77,7 +77,7 @@ static offset_t mp_seek(URLContext *h, offset_t pos, int whence){ else if(whence != SEEK_SET) return -1; - if(pos<stream->end_pos) + if(pos<stream->end_pos && stream->eof) stream_reset(stream); if(stream_seek(stream, pos)==0) return -1; @@ -155,7 +155,14 @@ int demux_open_lavf(demuxer_t *demuxer){ return 0; } -//demux_info_add(demuxer, "author", string); ... + if(avfc->title [0]) demux_info_add(demuxer, "name" , avfc->title ); + if(avfc->author [0]) demux_info_add(demuxer, "author" , avfc->author ); + if(avfc->copyright[0]) demux_info_add(demuxer, "copyright", avfc->copyright); + if(avfc->comment [0]) demux_info_add(demuxer, "comments" , avfc->comment ); + if(avfc->album [0]) demux_info_add(demuxer, "album" , avfc->album ); +// if(avfc->year ) demux_info_add(demuxer, "year" , avfc->year ); +// if(avfc->track ) demux_info_add(demuxer, "track" , avfc->track ); + if(avfc->genre [0]) demux_info_add(demuxer, "genre" , avfc->genre ); for(i=0; i<avfc->nb_streams; i++){ AVStream *st= avfc->streams[i]; @@ -211,6 +218,12 @@ int demux_open_lavf(demuxer_t *demuxer){ sh_video->fps=(float)sh_video->video.dwRate/(float)sh_video->video.dwScale; sh_video->frametime=(float)sh_video->video.dwScale/(float)sh_video->video.dwRate; sh_video->format = bih->biCompression; + sh_video->aspect= codec->width * codec->sample_aspect_ratio.num + / (float)(codec->height * codec->sample_aspect_ratio.den); + mp_msg(MSGT_DEMUX,MSGL_DBG2,"aspect= %d*%d/(%d*%d)\n", + codec->width, codec->sample_aspect_ratio.num, + codec->height, codec->sample_aspect_ratio.den); + sh_video->ds= demuxer->video; if(codec->extradata_size) memcpy(sh_video->bih + 1, codec->extradata, codec->extradata_size); |