[MPlayer-cvslog] r24319 - in trunk: libmpcodecs/vd.c libmpdemux/stheader.h

[nicodvb]

Author: nicodvb
Date: Sat Sep  1 17:54:45 2007
New Revision: 24319

Log:
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


Modified:
   trunk/libmpcodecs/vd.c
   trunk/libmpdemux/stheader.h

Modified: trunk/libmpcodecs/vd.c
==============================================================================
--- trunk/libmpcodecs/vd.c	(original)
+++ trunk/libmpcodecs/vd.c	Sat Sep  1 17:54:45 2007
@@ -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){

Modified: trunk/libmpdemux/stheader.h
==============================================================================
--- trunk/libmpdemux/stheader.h	(original)
+++ trunk/libmpdemux/stheader.h	Sat Sep  1 17:54:45 2007
@@ -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)