]> git.sesse.net Git - x264/commitdiff
Fix 10l in API change
authorFiona Glaser <fiona@x264.com>
Thu, 24 Sep 2009 15:40:45 +0000 (08:40 -0700)
committerFiona Glaser <fiona@x264.com>
Thu, 24 Sep 2009 15:47:53 +0000 (08:47 -0700)
frame_num was set to 1, not 0, for the first frame.  This broke spec compliance.
Didn't actually seem to cause any problems though except for breaking decoding on Quicktime.

encoder/encoder.c

index 78d64b3aa273e3459e094b781bea2266888453aa..919db08f6125dce508caf77158f10b988da54440 100644 (file)
@@ -1787,9 +1787,6 @@ int     x264_encoder_encode( x264_t *h,
     if( h->sh.i_type == SLICE_TYPE_B )
         x264_macroblock_bipred_init( h );
 
-    if( i_nal_ref_idc != NAL_PRIORITY_DISPOSABLE )
-        h->i_frame_num++;
-
     /* ---------------------- Write the bitstream -------------------------- */
     /* Init bitstream context */
     h->out.i_nal = 0;
@@ -1859,6 +1856,9 @@ int     x264_encoder_encode( x264_t *h,
     /* ------------------------ Create slice header  ----------------------- */
     x264_slice_init( h, i_nal_type, i_global_qp );
 
+    if( i_nal_ref_idc != NAL_PRIORITY_DISPOSABLE )
+        h->i_frame_num++;
+
     /* Write frame */
     if( h->param.i_threads > 1 )
     {