[vlc-commits] avcodec: remove bogus conditional

Rémi Denis-Courmont git at videolan.org
Mon Oct 26 19:31:40 CET 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Sep 28 23:34:40 2015 +0300| [e7f7c9cbad32675b02592a8d3a5d3da470b0a0ce] | committer: Rémi Denis-Courmont

avcodec: remove bogus conditional

Both branches of the conditionals had the same results.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e7f7c9cbad32675b02592a8d3a5d3da470b0a0ce
---

 modules/codec/avcodec/video.c |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c
index b67a058..513f3c2 100644
--- a/modules/codec/avcodec/video.c
+++ b/modules/codec/avcodec/video.c
@@ -142,17 +142,8 @@ static int lavc_UpdateVideoFormat( decoder_t *p_dec, AVCodecContext *p_context,
     }
     p_dec->fmt_out.video.i_width = width;
     p_dec->fmt_out.video.i_height = height;
-
-    if( width != p_context->width || height != p_context->height )
-    {
-        p_dec->fmt_out.video.i_visible_width = p_context->width;
-        p_dec->fmt_out.video.i_visible_height = p_context->height;
-    }
-    else
-    {
-        p_dec->fmt_out.video.i_visible_width = width;
-        p_dec->fmt_out.video.i_visible_height = height;
-    }
+    p_dec->fmt_out.video.i_visible_width = p_context->width;
+    p_dec->fmt_out.video.i_visible_height = p_context->height;
 
     /* If an aspect-ratio was specified in the input format then force it */
     if( p_dec->fmt_in.video.i_sar_num > 0 && p_dec->fmt_in.video.i_sar_den > 0 )



More information about the vlc-commits mailing list