[MPlayer-cvslog] r37368 - trunk/libmpcodecs/vd_ffmpeg.c

reimar subversion at mplayerhq.hu
Tue Feb 3 00:46:06 CET 2015


Author: reimar
Date: Tue Feb  3 00:46:05 2015
New Revision: 37368

Log:
vd_ffmpeg.c: fix indentation after last commit.

Modified:
   trunk/libmpcodecs/vd_ffmpeg.c

Modified: trunk/libmpcodecs/vd_ffmpeg.c
==============================================================================
--- trunk/libmpcodecs/vd_ffmpeg.c	Tue Feb  3 00:46:04 2015	(r37367)
+++ trunk/libmpcodecs/vd_ffmpeg.c	Tue Feb  3 00:46:05 2015	(r37368)
@@ -605,16 +605,16 @@ static void update_configuration(sh_vide
         set_format_params(avctx, pix_fmt);
 
         if (!ignore_aspect) {
-        mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
+            mp_msg(MSGT_DECVIDEO, MSGL_V, "[ffmpeg] aspect_ratio: %f\n", aspect);
 
-        // Do not overwrite sh->original_aspect on the first call,
-        // if a container aspect is available (which is preferred then).
-        // But set it even if the sample aspect did not change, since a
-        // resolution change can cause an aspect change even if the
-        // _sample_ aspect is unchanged.
-        if (sh->original_aspect == 0 || (aspect_change && ctx->last_sample_aspect_ratio.den))
-            sh->original_aspect = aspect;
-        ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio;
+            // Do not overwrite sh->original_aspect on the first call,
+            // if a container aspect is available (which is preferred then).
+            // But set it even if the sample aspect did not change, since a
+            // resolution change can cause an aspect change even if the
+            // _sample_ aspect is unchanged.
+            if (sh->original_aspect == 0 || (aspect_change && ctx->last_sample_aspect_ratio.den))
+                sh->original_aspect = aspect;
+            ctx->last_sample_aspect_ratio = avctx->sample_aspect_ratio;
         }
         ctx->pix_fmt = pix_fmt;
         ctx->best_csp = pixfmt2imgfmt2(pix_fmt, avctx->codec_id);


More information about the MPlayer-cvslog mailing list