# HG changeset patch # User ib # Date 1375639944 0 # Node ID 6f0ab9dd1429f5a009fb507a6cf292c26beb9e42 # Parent b50212f27ffa69e11a25df4cf2949f32981a4807 Fix definition of sh->original_aspect. Since 0 is a valid aspect ratio, initialization must be different. This has been a bug in r36391. diff -r b50212f27ffa -r 6f0ab9dd1429 libmpcodecs/vd.c --- a/libmpcodecs/vd.c Sun Aug 04 13:30:42 2013 +0000 +++ b/libmpcodecs/vd.c Sun Aug 04 18:12:24 2013 +0000 @@ -292,7 +292,7 @@ } // time to do aspect ratio corrections... - if (!sh->original_aspect) + if (sh->original_aspect == -1.0) sh->original_aspect = sh->stream_aspect != 0.0 ? sh->stream_aspect : sh->aspect; if (movie_aspect > -1.0) diff -r b50212f27ffa -r 6f0ab9dd1429 libmpdemux/demuxer.c --- a/libmpdemux/demuxer.c Sun Aug 04 13:30:42 2013 +0000 +++ b/libmpdemux/demuxer.c Sun Aug 04 18:12:24 2013 +0000 @@ -380,6 +380,7 @@ mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id); else { sh_video_t *sh = calloc(1, sizeof(sh_video_t)); + sh->original_aspect = -1.0; mp_msg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id); demuxer->v_streams[id] = sh; sh->vid = vid;