summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-01 20:56:45 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-01 20:56:45 +0000
commit7ac5a60a2ba4c7d0b8c23a527ba0ede1607cbf23 (patch)
treec7db1c82738962412b9cff63967784a5e4e10ea3 /mplayer.c
parenta108787e0067d2b5faed0d945ec50a6dd46be4c0 (diff)
downloadmpv-7ac5a60a2ba4c7d0b8c23a527ba0ede1607cbf23.tar.bz2
mpv-7ac5a60a2ba4c7d0b8c23a527ba0ede1607cbf23.tar.xz
moved to reinit_video_chain() the assignment of sh_video->stream_aspect, where it makes more sense
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24322 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mplayer.c b/mplayer.c
index cafdd9eacc..7c8ce6356f 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -1887,6 +1887,7 @@ static int sleep_until_update(float *time_frame, float *aq_sleep_time)
int reinit_video_chain(void) {
sh_video_t * const sh_video = mpctx->sh_video;
+ double ar=-1.0;
//================== Init VIDEO (codec & libvo) ==========================
if(!fixed_vo || !(inited_flags&INITED_VO)){
current_module="preinit_libvo";
@@ -1902,6 +1903,8 @@ int reinit_video_chain(void) {
inited_flags|=INITED_VO;
}
+ if(stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED)
+ mpctx->sh_video->stream_aspect = ar;
current_module="init_video_filters";
{
char* vf_arg[] = { "_oldargs_", (char*)mpctx->video_out , NULL };
@@ -3067,7 +3070,6 @@ mpctx->sh_video=mpctx->d_video->sh;
if(mpctx->sh_video){
- double ar=-1.0;
current_module="video_read_properties";
if(!video_read_properties(mpctx->sh_video)) {
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_CannotReadVideoProperties);
@@ -3089,8 +3091,6 @@ if(mpctx->sh_video){
mp_msg(MSGT_CPLAYER,MSGL_ERR,MSGTR_FPSnotspecified);
mpctx->sh_video=mpctx->d_video->sh=NULL;
}
- if(stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_ASPECT_RATIO, &ar) != STREAM_UNSUPPORTED)
- mpctx->sh_video->stream_aspect = ar;
}
}