OSDN Git Service

libx264: fix setting the H.264 level
authorAndrej Peterka <andrej.peterka@najdi.si>
Wed, 7 Sep 2011 06:27:28 +0000 (08:27 +0200)
committerAnton Khirnov <anton@khirnov.net>
Wed, 7 Sep 2011 07:16:06 +0000 (09:16 +0200)
Move setting it after x264_param_default_preset()

Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/libx264.c

index d915735..305c26a 100644 (file)
@@ -229,15 +229,15 @@ static av_cold int X264_init(AVCodecContext *avctx)
     x4->params.analyse.i_trellis          = avctx->trellis;
     x4->params.analyse.i_noise_reduction  = avctx->noise_reduction;
 
-    if (avctx->level > 0)
-        x4->params.i_level_idc = avctx->level;
-
     if (x4->preset || x4->tune)
         if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) {
             av_log(avctx, AV_LOG_ERROR, "Error setting preset/tune %s/%s.\n", x4->preset, x4->tune);
             return AVERROR(EINVAL);
         }
 
+    if (avctx->level > 0)
+        x4->params.i_level_idc = avctx->level;
+
     x4->params.pf_log               = X264_log;
     x4->params.p_log_private        = avctx;
     x4->params.i_log_level          = X264_LOG_DEBUG;