Mercurial > mplayer.hg
comparison libmpcodecs/vd.c @ 36304:6f0ab9dd1429
Fix definition of sh->original_aspect.
Since 0 is a valid aspect ratio,
initialization must be different.
This has been a bug in r36391.
| author | ib |
|---|---|
| date | Sun, 04 Aug 2013 18:12:24 +0000 |
| parents | 0bd0297b073a |
| children | d8a13d907c61 |
comparison
equal
deleted
inserted
replaced
| 36303:b50212f27ffa | 36304:6f0ab9dd1429 |
|---|---|
| 290 vf_add_before_vo(&vf, "flip", NULL); | 290 vf_add_before_vo(&vf, "flip", NULL); |
| 291 sh->vfilter = vf; | 291 sh->vfilter = vf; |
| 292 } | 292 } |
| 293 // time to do aspect ratio corrections... | 293 // time to do aspect ratio corrections... |
| 294 | 294 |
| 295 if (!sh->original_aspect) | 295 if (sh->original_aspect == -1.0) |
| 296 sh->original_aspect = sh->stream_aspect != 0.0 ? sh->stream_aspect : sh->aspect; | 296 sh->original_aspect = sh->stream_aspect != 0.0 ? sh->stream_aspect : sh->aspect; |
| 297 | 297 |
| 298 if (movie_aspect > -1.0) | 298 if (movie_aspect > -1.0) |
| 299 sh->aspect = movie_aspect; // cmdline overrides autodetect | 299 sh->aspect = movie_aspect; // cmdline overrides autodetect |
| 300 else if (sh->stream_aspect != 0.0) | 300 else if (sh->stream_aspect != 0.0) |