es_out.c: fixed a slight memleak in "now playing" handling.

[vlc] / src / video_output / vout_pictures.c

diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 433cef68dce192c6ea4af5944c781167f43eb7c6..0cb0c72c7749b4b2d5c50e406351453d2ddd4607 100644 (file)
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -440,29 +440,23 @@ void vout_PlacePicture( vout_thread_t *p_vout,
     }
     else
     {
-        *pi_width = __MIN( i_width, p_vout->render.i_width );
-        *pi_height = __MIN( i_height, p_vout->render.i_height );
+        *pi_width = __MIN( i_width, p_vout->fmt_in.i_visible_width );
+        *pi_height = __MIN( i_height, p_vout->fmt_in.i_visible_height );
     }
 
-    if( VOUT_ASPECT_FACTOR * *pi_width / *pi_height < p_vout->render.i_aspect )
+    if( p_vout->fmt_in.i_visible_width * (int64_t)p_vout->fmt_in.i_sar_num *
+        *pi_height / p_vout->fmt_in.i_visible_height /
+        p_vout->fmt_in.i_sar_den > *pi_width )
     {
-        *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+        *pi_height = p_vout->fmt_in.i_visible_height *
+            (int64_t)p_vout->fmt_in.i_sar_den * *pi_width /
+            p_vout->fmt_in.i_visible_width / p_vout->fmt_in.i_sar_num;
     }
     else
     {
-        *pi_height = *pi_width * VOUT_ASPECT_FACTOR / p_vout->render.i_aspect;
-    }
-
-    if( *pi_width > i_width )
-    {
-        *pi_width = i_width;
-        *pi_height = VOUT_ASPECT_FACTOR * *pi_width / p_vout->render.i_aspect;
-    }
-
-    if( *pi_height > i_height )
-    {
-        *pi_height = i_height;
-        *pi_width = *pi_height * p_vout->render.i_aspect / VOUT_ASPECT_FACTOR;
+        *pi_width = p_vout->fmt_in.i_visible_width *
+            (int64_t)p_vout->fmt_in.i_sar_num * *pi_height /
+            p_vout->fmt_in.i_visible_height / p_vout->fmt_in.i_sar_den;
     }
 
     switch( p_vout->i_alignment & VOUT_ALIGN_HMASK )