summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 19:22:56 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-04-26 19:23:32 +0300
commitf38efd166e43f5cae783f38f9913d2859557143e (patch)
tree38f49af429d4147e390f0b52384294b2e35b9d6f /mplayer.c
parent7a33e76943ecc3f2ba185a1bea56c8416b74d6dd (diff)
parent4e853e19ef349a453ef069d76b830a3dbfa444c3 (diff)
downloadmpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.bz2
mpv-f38efd166e43f5cae783f38f9913d2859557143e.tar.xz
Merge svn changes up to r31097
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mplayer.c b/mplayer.c
index af4fd37d1e..545672f59f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -4308,7 +4308,8 @@ if(auto_quality>0){
if (mp_dvdnav_stream_has_changed(mpctx->stream)) {
double ar = -1.0;
- if (stream_control (mpctx->demuxer->stream,
+ if (mpctx->sh_video &&
+ stream_control (mpctx->demuxer->stream,
STREAM_CTRL_GET_ASPECT_RATIO, &ar)
!= STREAM_UNSUPPORTED)
mpctx->sh_video->stream_aspect = ar;