summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-12-20 20:50:54 +0100
committerwm4 <wm4@nowhere>2015-12-20 20:50:54 +0100
commitf2187de8bb9eedf45e0d6629e4d664eb32f311ac (patch)
tree4ee4d43e6af5439c2adb56e39c24516d19dcbe9d
parent31c29495ca7c95a7d5aa90ded9b53e3d7d504391 (diff)
downloadmpv-f2187de8bb9eedf45e0d6629e4d664eb32f311ac.tar.bz2
mpv-f2187de8bb9eedf45e0d6629e4d664eb32f311ac.tar.xz
demux_disc: fix aspect ratio retrieval (again)
Commit 127da161 was not properly tested either - it did nothing, and just made it use the video bitstream aspect ratio determined by libavformat (which isn't always the correct one).
-rw-r--r--demux/demux_disc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/demux/demux_disc.c b/demux/demux_disc.c
index 66079082d2..1abae38d35 100644
--- a/demux/demux_disc.c
+++ b/demux/demux_disc.c
@@ -149,9 +149,9 @@ static void add_streams(demuxer_t *demuxer)
if (stream_control(demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar)
== STREAM_OK)
{
- struct mp_image_params f = {.w = sh->video->disp_w * 1728,
- .h = sh->video->disp_h * 1728};
- mp_image_params_set_dsize(&f, f.w * ar, f.h / ar);
+ struct mp_image_params f = {.w = src->video->disp_w,
+ .h = src->video->disp_h};
+ mp_image_params_set_dsize(&f, 1728 * ar, 1728);
sh->video->par_w = f.p_w;
sh->video->par_h = f.p_h;
}