diff options
| author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-01 15:54:45 +0000 |
|---|---|---|
| committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-09-01 15:54:45 +0000 |
| commit | 1dbfe77925d859624a6ada592c80cf5c2e59dee7 (patch) | |
| tree | ef35eb0d5c15a498f42e3b955828500ab64e1c7c | |
| parent | d20ff3542d773c79bf00007a356816e8bc631465 (diff) | |
| download | mpv-1dbfe77925d859624a6ada592c80cf5c2e59dee7.tar.bz2 mpv-1dbfe77925d859624a6ada592c80cf5c2e59dee7.tar.xz | |
added .stream_aspect to st_video_t: if non-zero and if not specified otherwise
by the user the video pipeline will use it as current aspect ratio
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24319 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | libmpcodecs/vd.c | 1 | ||||
| -rw-r--r-- | libmpdemux/stheader.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 2eea3991f0..ad22041d9c 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -246,6 +246,7 @@ csp_again: // time to do aspect ratio corrections... if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect + else if(sh->stream_aspect!=0.0) sh->aspect = sh->stream_aspect; // if(!sh->aspect) sh->aspect=1.0; if(opt_screen_size_x||opt_screen_size_y){ diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index 3bd3725f1f..b869ba3146 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -73,6 +73,7 @@ typedef struct { float fps; // frames per second (set only if constant fps) float frametime; // 1/fps float aspect; // aspect ratio stored in the file (for prescaling) + float stream_aspect; // aspect ratio stored in the media headers (e.g. in DVD IFO files) int i_bps; // == bitrate (compressed bytes/sec) int disp_w,disp_h; // display size (filled by fileformat parser) // output driver/filters: (set by libmpcodecs core) |