diff options
author | wm4 <wm4@nowhere> | 2015-12-19 20:04:31 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-12-19 20:45:36 +0100 |
commit | 0a0bb9059f42671c267ea5d0c8faa3ac71a8c742 (patch) | |
tree | 89cbdee7748d36f98cc5d0efbfc8a3fc810b2016 /demux/stheader.h | |
parent | 1f7c099dc0feb9a160d9018ad6ad068e0295341a (diff) | |
download | mpv-0a0bb9059f42671c267ea5d0c8faa3ac71a8c742.tar.bz2 mpv-0a0bb9059f42671c267ea5d0c8faa3ac71a8c742.tar.xz |
video: switch from using display aspect to sample aspect
MPlayer traditionally always used the display aspect ratio, e.g. 16:9,
while FFmpeg uses the sample (aka pixel) aspect ratio.
Both have a bunch of advantages and disadvantages. Actually, it seems
using sample aspect ratio is generally nicer. The main reason for the
change is making mpv closer to how FFmpeg works in order to make life
easier. It's also nice that everything uses integer fractions instead
of floats now (except --video-aspect option/property).
Note that there is at least 1 user-visible change: vf_dsize now does
not set the display size, only the display aspect ratio. This is
because the image_params d_w/d_h fields did not just set the display
aspect, but also the size (except in encoding mode).
Diffstat (limited to 'demux/stheader.h')
-rw-r--r-- | demux/stheader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 7a11832c24..e325b52bf1 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -83,7 +83,7 @@ typedef struct sh_audio { typedef struct sh_video { bool avi_dts; // use DTS timing; first frame and DTS is 0 float fps; // frames per second (set only if constant fps) - float aspect; // aspect ratio stored in the file (for prescaling) + int par_w, par_h; // pixel aspect ratio (0 if unknown/square) int bits_per_coded_sample; int disp_w, disp_h; // display size int rotate; // intended display rotation, in degrees, [0, 359] |