Commit 6e96d8a9 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

lib: check scale range in libvlc_video_set_scale()

parent f350b09d
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include <vlc_vout.h> #include <vlc_vout.h>
#include "media_player_internal.h" #include "media_player_internal.h"
#include <math.h>
#include <assert.h> #include <assert.h>
/* /*
...@@ -237,7 +238,7 @@ float libvlc_video_get_scale( libvlc_media_player_t *mp ) ...@@ -237,7 +238,7 @@ float libvlc_video_get_scale( libvlc_media_player_t *mp )
void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale ) void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale )
{ {
if (f_scale != 0.) if (isfinite(f_scale) && f_scale != 0.f)
var_SetFloat (p_mp, "scale", f_scale); var_SetFloat (p_mp, "scale", f_scale);
var_SetBool (p_mp, "autoscale", f_scale == 0.f); var_SetBool (p_mp, "autoscale", f_scale == 0.f);
...@@ -248,7 +249,7 @@ void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale ) ...@@ -248,7 +249,7 @@ void libvlc_video_set_scale( libvlc_media_player_t *p_mp, float f_scale )
{ {
vout_thread_t *p_vout = pp_vouts[i]; vout_thread_t *p_vout = pp_vouts[i];
if (f_scale != 0.) if (isfinite(f_scale) && f_scale != 0.f)
var_SetFloat (p_vout, "scale", f_scale); var_SetFloat (p_vout, "scale", f_scale);
var_SetBool (p_vout, "autoscale", f_scale == 0.f); var_SetBool (p_vout, "autoscale", f_scale == 0.f);
vlc_object_release (p_vout); vlc_object_release (p_vout);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment