From: Fiona Glaser <fiona@x264.com>
Date: Mon, 7 Feb 2011 07:12:09 +0000 (-0800)
Subject: Fix 10L in r1886
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d147eea3cde028059f8c3ed65c49ad6692ecd629;p=libx264

Fix 10L in r1886
Aspect ratio can't be set before SPS is initted.
---

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 5e8780e3..4d31becb 100644
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -949,8 +949,6 @@ x264_t *x264_encoder_open( x264_param_t *param )
     if( h->param.rc.psz_stat_in )
         h->param.rc.psz_stat_in = strdup( h->param.rc.psz_stat_in );
 
-    x264_set_aspect_ratio( h, &h->param, 1 );
-
     x264_reduce_fraction( &h->param.i_fps_num, &h->param.i_fps_den );
     x264_reduce_fraction( &h->param.i_timebase_num, &h->param.i_timebase_den );
 
@@ -971,6 +969,8 @@ x264_t *x264_encoder_open( x264_param_t *param )
     h->pps = &h->pps_array[0];
     x264_pps_init( h->pps, h->param.i_sps_id, &h->param, h->sps );
 
+    x264_set_aspect_ratio( h, &h->param, 1 );
+
     x264_validate_levels( h, 1 );
 
     h->chroma_qp_table = i_chroma_qp_table + 12 + h->pps->i_chroma_qp_index_offset;