Request 6064 (accepted)

libx264.changes Changed

libx264.spec Changed

x264-0.164+git20220602.baee400f.tar.xz/.gitlab-ci.yml -> x264-0.164+git20231001.31e19f92.tar.xz/.gitlab-ci.yml Changed

@@ -42,6 +42,7 @@
     _CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-x86_64/"
     _XCFLAGS: "-arch x86_64"
     _XLDFLAGS: "-arch x86_64"
+    _BIN_PATH: /Users/videolanci/sandbox/bin
 
 .variables-macos-arm64: &variables-macos-arm64
     _TRIPLET: "aarch64-apple-darwin19"
@@ -50,6 +51,7 @@
     _CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-arm64/"
     _XCFLAGS: "-arch arm64"
     _XLDFLAGS: "-arch arm64"
+    _BIN_PATH: /Users/videolanci/sandbox/bin
 
 .build:
     stage: build
@@ -147,6 +149,7 @@
     extends: .build
     script: |
         set -x
+        export PATH="${_BIN_PATH}:$PATH"
         LOCAL_INSTALL_DIR=`pwd`/${_TRIPLET}
         export PKG_CONFIG_LIBDIR=${LOCAL_INSTALL_DIR}/lib/pkgconfig
         curl -f -o vlc-contrib.txt ${_CONTRIB_URL}
@@ -168,14 +171,14 @@
     extends: .build-macos
     tags:
         - amd64
-        - catalina
+        - monterey
     variables: *variables-macos-x86_64
 
 build-macos-arm64:
     extends: .build-macos
     tags:
         - amd64
-        - catalina
+        - monterey
     variables: *variables-macos-arm64
 
 .test: &test

x264-0.164+git20220602.baee400f.tar.xz/Makefile -> x264-0.164+git20231001.31e19f92.tar.xz/Makefile Changed

@@ -242,12 +242,12 @@
 lib-static: $(LIBX264)
 lib-shared: $(SONAME)
 
-$(LIBX264): $(GENERATED) .depend $(OBJS) $(OBJASM)
+$(LIBX264): $(OBJS) $(OBJASM)
 	rm -f $(LIBX264)
 	$(AR)$@ $(OBJS) $(OBJASM)
 	$(if $(RANLIB), $(RANLIB) $@)
 
-$(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)
+$(SONAME): $(OBJS) $(OBJASM) $(OBJSO)
 	$(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)
 
 $(IMPLIBNAME): $(SONAME)
@@ -260,16 +260,16 @@
 example: example$(EXE)
 endif
 
-x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)
+x264$(EXE): $(OBJCLI) $(CLI_LIBX264)
 	$(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)
 
-checkasm8$(EXE): $(GENERATED) .depend $(OBJCHK) $(OBJCHK_8) $(LIBX264)
+checkasm8$(EXE): $(OBJCHK) $(OBJCHK_8) $(LIBX264)
 	$(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS)
 
-checkasm10$(EXE): $(GENERATED) .depend $(OBJCHK) $(OBJCHK_10) $(LIBX264)
+checkasm10$(EXE): $(OBJCHK) $(OBJCHK_10) $(LIBX264)
 	$(LD)$@ $(OBJCHK) $(OBJCHK_10) $(LIBX264) $(LDFLAGS)
 
-example$(EXE): $(GENERATED) .depend $(OBJEXAMPLE) $(LIBX264)
+example$(EXE): $(OBJEXAMPLE) $(LIBX264)
 	$(LD)$@ $(OBJEXAMPLE) $(LIBX264) $(LDFLAGS)
 
 $(OBJS) $(OBJSO): CFLAGS += $(CFLAGSSO)
@@ -316,7 +316,7 @@
 %.o: %.rc x264.h x264res.manifest
 	$(RC) $(RCFLAGS)$@ $<
 
-.depend: config.mak
+.depend: config.mak $(GENERATED)
 	@rm -f .depend
 	@echo 'dependency file generation...'
 ifeq ($(COMPILER),CL)

x264-0.164+git20220602.baee400f.tar.xz/autocomplete.c -> x264-0.164+git20231001.31e19f92.tar.xz/autocomplete.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * autocomplete: x264cli shell autocomplete
  *****************************************************************************
- * Copyright (C) 2018-2022 x264 project
+ * Copyright (C) 2018-2023 x264 project
  *
  * Authors: Henrik Gramner <henrik@gramner.com>
  *
@@ -240,7 +240,7 @@
 static void suggest( const char *s, const char *cur, int cur_len )
 {
     if( s && *s && !strncmp( s, cur, cur_len ) )
-        printf( "%s\n", s );
+        printf( "%s ", s );
 }
 
 static void suggest_lower( const char *s, const char *cur, int cur_len )
@@ -249,7 +249,7 @@
     {
         for( ; *s; s++ )
             putchar( *s < 'A' || *s > 'Z' ? *s : *s | 0x20 );
-        putchar( '\n' );
+        putchar( ' ' );
     }
 }
 
@@ -273,7 +273,7 @@
         {
             int tok_len = tok_end - s;
             if( tok_len && tok_len >= cur_len && !strncmp( s, cur, cur_len ) )
-                printf( "%.*s\n", tok_len, s );
+                printf( "%.*s ", tok_len, s );
         }
         suggest( s, cur, cur_len );
     }
@@ -403,5 +403,6 @@
             suggest_list( opts_special );
     }
 
+    putchar( '\n' );
     return 0;
 }

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/asm-offsets.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/asm-offsets.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/asm-offsets.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/asm-offsets.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/asm.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/asm.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/bitstream-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/bitstream-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/bitstream.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/bitstream.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/cabac-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/cabac-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/dct-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/dct-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/dct.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/dct.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/deblock-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/deblock-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/deblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/deblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/mc-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/mc-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/mc-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/mc-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/mc.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/mc.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/pixel-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/pixel-a.S Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * pixel.S: aarch64 pixel metrics
  *****************************************************************************
- * Copyright (C) 2009-2022 x264 project
+ * Copyright (C) 2009-2023 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>
@@ -40,6 +40,7 @@
 .short 0, -1, -1, -1, -1, -1, -1, -1
 endconst
 
+#if BIT_DEPTH == 8
 .macro SAD_START_4
     ld1        {v1.s}0, x2, x3
     ld1        {v0.s}0, x0, x1
@@ -112,6 +113,110 @@
 endfunc
 .endm
 
+#else /* BIT_DEPTH == 8 */
+
+.macro SAD_START_4
+    lsl        x1, x1, #1
+    lsl        x3, x3, #1
+    ld1        {v1.d}0, x2, x3
+    ld1        {v0.d}0, x0, x1
+    ld1        {v1.d}1, x2, x3
+    ld1        {v0.d}1, x0, x1
+    uabdl       v16.4s,  v0.4h,  v1.4h
+    uabdl2      v18.4s,  v0.8h,  v1.8h
+.endm
+
+.macro SAD_4
+    ld1        {v1.d}0, x2, x3
+    ld1        {v0.d}0, x0, x1
+    ld1        {v1.d}1, x2, x3
+    ld1        {v0.d}1, x0, x1
+    uabal       v16.4s,  v0.4h,  v1.4h
+    uabal2      v18.4s,  v0.8h,  v1.8h
+.endm
+
+.macro SAD_START_8
+    lsl         x1, x1, #1
+    lsl         x3, x3, #1
+    ld1         {v1.8h}, x2, x3
+    ld1         {v0.8h}, x0, x1
+    ld1         {v3.8h}, x2, x3
+    ld1         {v2.8h}, x0, x1
+    uabdl       v16.4s,  v0.4h,  v1.4h
+    uabdl2      v17.4s,  v0.8h,  v1.8h
+    uabdl       v18.4s,  v2.4h,  v3.4h
+    uabdl2      v19.4s,  v2.8h,  v3.8h
+.endm
+
+.macro SAD_8
+    ld1         {v1.8h}, x2, x3
+    ld1         {v0.8h}, x0, x1
+    ld1         {v3.8h}, x2, x3
+    ld1         {v2.8h}, x0, x1
+    uabal       v16.4s,  v0.4h,  v1.4h
+    uabal2      v17.4s,  v0.8h,  v1.8h
+    uabal       v18.4s,  v2.4h,  v3.4h
+    uabal2      v19.4s,  v2.8h,  v3.8h
+.endm
+
+.macro SAD_START_16
+    lsl         x1, x1, #1
+    lsl         x3, x3, #1
+    ld2         {v0.8h, v1.8h}, x2, x3
+    ld2         {v2.8h, v3.8h}, x0, x1
+    ld2         {v4.8h, v5.8h}, x2, x3
+    ld2         {v6.8h, v7.8h}, x0, x1
+    uabdl       v16.4s,  v0.4h,  v2.4h
+    uabdl2      v17.4s,  v0.8h,  v2.8h
+    uabdl       v20.4s,  v1.4h,  v3.4h
+    uabdl2      v21.4s,  v1.8h,  v3.8h
+    uabdl       v18.4s,  v4.4h,  v6.4h
+    uabdl2      v19.4s,  v4.8h,  v6.8h
+    uabdl       v22.4s,  v5.4h,  v7.4h
+    uabdl2      v23.4s,  v5.8h,  v7.8h
+.endm
+
+.macro SAD_16
+    ld2         {v0.8h, v1.8h}, x2, x3
+    ld2         {v2.8h, v3.8h}, x0, x1
+    ld2         {v4.8h, v5.8h}, x2, x3
+    ld2         {v6.8h, v7.8h}, x0, x1
+    uabal       v16.4s,  v0.4h,  v2.4h
+    uabal2      v17.4s,  v0.8h,  v2.8h
+    uabal       v20.4s,  v1.4h,  v3.4h
+    uabal2      v21.4s,  v1.8h,  v3.8h
+    uabal       v18.4s,  v4.4h,  v6.4h
+    uabal2      v19.4s,  v4.8h,  v6.8h
+    uabal       v22.4s,  v5.4h,  v7.4h
+    uabal2      v23.4s,  v5.8h,  v7.8h
+.endm
+
+.macro SAD_FUNC w, h, name
+function pixel_sad\name\()_\w\()x\h\()_neon, export=1
+    SAD_START_\w
+
+.rept \h / 2 - 1
+    SAD_\w
+.endr
+.if \w > 8
+    add         v20.4s,  v20.4s,  v21.4s
+    add         v16.4s,  v16.4s,  v20.4s
+    add         v22.4s,  v22.4s,  v23.4s
+    add         v18.4s,  v18.4s,  v22.4s
+.endif
+.if \w > 4
+    add         v16.4s,  v16.4s,  v17.4s
+    add         v18.4s,  v18.4s,  v19.4s
+.endif
+    add         v16.4s,  v16.4s,  v18.4s
+    uaddlv      s0,  v16.8h
+    fmov        w0,  s0
+    ret
+endfunc
+.endm
+
+#endif /* BIT_DEPTH == 8 */
+
 SAD_FUNC  4,  4
 SAD_FUNC  4,  8
 SAD_FUNC  4,  16

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/pixel.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/pixel.h Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * pixel.h: aarch64 pixel metrics
  *****************************************************************************
- * Copyright (C) 2009-2022 x264 project
+ * Copyright (C) 2009-2023 x264 project
  *
  * Authors: David Conrad <lessen42@gmail.com>
  *          Janne Grunau <janne-x264@jannau.net>
@@ -76,11 +76,11 @@
     ret x264_pixel_##name##_4x4_##suffix args;\
 
 #define DECL_X1( name, suffix ) \
-    DECL_PIXELS( int, name, suffix, ( uint8_t *, intptr_t, uint8_t *, intptr_t ) )
+    DECL_PIXELS( int, name, suffix, ( pixel *, intptr_t, pixel *, intptr_t ) )
 
 #define DECL_X4( name, suffix ) \
-    DECL_PIXELS( void, name##_x3, suffix, ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int * ) )\
-    DECL_PIXELS( void, name##_x4, suffix, ( uint8_t *, uint8_t *, uint8_t *, uint8_t *, uint8_t *, intptr_t, int * ) )
+    DECL_PIXELS( void, name##_x3, suffix, ( pixel *, pixel *, pixel *, pixel *, intptr_t, int * ) )\
+    DECL_PIXELS( void, name##_x4, suffix, ( pixel *, pixel *, pixel *, pixel *, pixel *, intptr_t, int * ) )
 
 DECL_X1( sad, neon )
 DECL_X4( sad, neon )

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/predict-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/predict-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/predict-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/predict-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/predict.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/predict.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/quant-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/quant-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/aarch64/quant.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/aarch64/quant.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/asm.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/asm.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/bitstream-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/bitstream-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/bitstream.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/bitstream.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/cpu-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/cpu-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/dct-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/dct-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/dct.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/dct.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/deblock-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/deblock-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/deblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/deblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/mc-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/mc-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/mc-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/mc-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/mc.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/mc.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/pixel-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/pixel-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/pixel.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/pixel.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/predict-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/predict-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/predict-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/predict-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/predict.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/predict.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/quant-a.S -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/quant-a.S Changed

x264-0.164+git20220602.baee400f.tar.xz/common/arm/quant.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/arm/quant.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/base.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/base.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/base.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/base.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/bitstream.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/bitstream.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/bitstream.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/bitstream.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/cabac.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/cabac.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/cabac.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/cabac.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/common.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/common.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/common.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/common.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/cpu.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/cpu.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/cpu.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/cpu.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/dct.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/dct.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/dct.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/dct.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/deblock.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/deblock.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/frame.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/frame.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * frame.c: frame handling
  *****************************************************************************
- * Copyright (C) 2003-2022 x264 project
+ * Copyright (C) 2003-2023 x264 project
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *          Loren Merritt <lorenm@u.washington.edu>
@@ -211,24 +211,25 @@
             for( int j = 0; j <= !!h->param.i_bframe; j++ )
                 for( int i = 0; i <= h->param.i_bframe; i++ )
                 {
-                    PREALLOC( frame->lowres_mvsji, 2*h->mb.i_mb_count*sizeof(int16_t) );
-                    PREALLOC( frame->lowres_mv_costsji, h->mb.i_mb_count*sizeof(int) );
+                    PREALLOC( frame->lowres_mvsji, 2*i_mb_count*sizeof(int16_t) );
+                    PREALLOC( frame->lowres_mv_costsji, i_mb_count*sizeof(int) );
                 }
             PREALLOC( frame->i_propagate_cost, i_mb_count * sizeof(uint16_t) );
             for( int j = 0; j <= h->param.i_bframe+1; j++ )
                 for( int i = 0; i <= h->param.i_bframe+1; i++ )
                     PREALLOC( frame->lowres_costsji, i_mb_count * sizeof(uint16_t) );
-
-            /* mbtree asm can overread the input buffers, make sure we don't read outside of allocated memory. */
-            prealloc_size += NATIVE_ALIGN;
         }
         if( h->param.rc.i_aq_mode )
         {
-            PREALLOC( frame->f_qp_offset, h->mb.i_mb_count * sizeof(float) );
-            PREALLOC( frame->f_qp_offset_aq, h->mb.i_mb_count * sizeof(float) );
+            PREALLOC( frame->f_qp_offset, i_mb_count * sizeof(float) );
+            PREALLOC( frame->f_qp_offset_aq, i_mb_count * sizeof(float) );
             if( h->frames.b_have_lowres )
-                PREALLOC( frame->i_inv_qscale_factor, (h->mb.i_mb_count+3) * sizeof(uint16_t) );
+                PREALLOC( frame->i_inv_qscale_factor, i_mb_count * sizeof(uint16_t) );
         }
+
+        /* mbtree asm can overread the input buffers, make sure we don't read outside of allocated memory. */
+        if( h->frames.b_have_lowres )
+            prealloc_size += NATIVE_ALIGN;
     }
 
     PREALLOC_END( frame->base );
@@ -281,14 +282,14 @@
 
             for( int j = 0; j <= !!h->param.i_bframe; j++ )
                 for( int i = 0; i <= h->param.i_bframe; i++ )
-                    memset( frame->lowres_mvsji, 0, 2*h->mb.i_mb_count*sizeof(int16_t) );
+                    memset( frame->lowres_mvsji, 0, 2*i_mb_count*sizeof(int16_t) );
 
             frame->i_intra_cost = frame->lowres_costs00;
-            memset( frame->i_intra_cost, -1, (i_mb_count+3) * sizeof(uint16_t) );
+            memset( frame->i_intra_cost, -1, i_mb_count * sizeof(uint16_t) );
 
             if( h->param.rc.i_aq_mode )
                 /* shouldn't really be initialized, just silences a valgrind false-positive in x264_mbtree_propagate_cost_sse2 */
-                memset( frame->i_inv_qscale_factor, 0, (h->mb.i_mb_count+3) * sizeof(uint16_t) );
+                memset( frame->i_inv_qscale_factor, 0, i_mb_count * sizeof(uint16_t) );
         }
     }
 
@@ -412,7 +413,7 @@
     {
         int p = i_csp == X264_CSP_UYVY;
         h->mc.plane_copy_deinterleave_yuyv( dst->planep, dst->i_stridep, dst->planep^1, dst->i_stridep^1,
-                                            (pixel*)src->img.plane0, src->img.i_stride0, h->param.i_width, h->param.i_height );
+                                            (pixel*)src->img.plane0, src->img.i_stride0/SIZEOF_PIXEL, h->param.i_width, h->param.i_height );
     }
     else if( i_csp == X264_CSP_V210 )
     {

x264-0.164+git20220602.baee400f.tar.xz/common/frame.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/frame.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/macroblock.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/macroblock.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/macroblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/macroblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mc.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mc.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mc.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mc.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/dct-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/dct-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/dct.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/dct.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/deblock-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/deblock-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/deblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/deblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/macros.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/macros.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/mc-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/mc-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/mc.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/mc.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/pixel-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/pixel-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/pixel.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/pixel.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/predict-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/predict-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/predict.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/predict.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/quant-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/quant-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mips/quant.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/mips/quant.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/mvpred.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/mvpred.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/opencl.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/opencl.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/opencl.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/opencl.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/osdep.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/osdep.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/osdep.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/osdep.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/pixel.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/pixel.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/pixel.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/pixel.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/dct.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/dct.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/dct.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/dct.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/deblock.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/deblock.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/deblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/deblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/mc.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/mc.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/mc.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/mc.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/pixel.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/pixel.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/pixel.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/pixel.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/ppccommon.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/ppccommon.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/predict.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/predict.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/predict.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/predict.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/quant.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/quant.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/ppc/quant.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/ppc/quant.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/predict.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/predict.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/predict.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/predict.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/quant.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/quant.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/quant.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/quant.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/rectangle.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/rectangle.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/rectangle.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/rectangle.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/set.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/set.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/set.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/set.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/tables.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/tables.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/tables.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/tables.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/threadpool.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/threadpool.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/threadpool.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/threadpool.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/vlc.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/vlc.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/win32thread.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/win32thread.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/win32thread.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/win32thread.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/bitstream-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/bitstream-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/bitstream.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/bitstream.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/cabac-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/cabac-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/const-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/const-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/cpu-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/cpu-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/dct-32.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/dct-32.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/dct-64.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/dct-64.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/dct-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/dct-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/dct.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/dct.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/deblock-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/deblock-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/deblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/deblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/mc-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/mc-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/mc-a2.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/mc-a2.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/mc-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/mc-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/mc.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/mc.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/pixel-32.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/pixel-32.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/pixel-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/pixel-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/pixel.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/pixel.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/predict-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/predict-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/predict-c.c -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/predict-c.c Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/predict.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/predict.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/quant-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/quant-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/quant.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/quant.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/sad-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/sad-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/sad16-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/sad16-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/trellis-64.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/trellis-64.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/util.h -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/util.h Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/x86inc.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/x86inc.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/common/x86/x86util.asm -> x264-0.164+git20231001.31e19f92.tar.xz/common/x86/x86util.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/config.guess -> x264-0.164+git20231001.31e19f92.tar.xz/config.guess Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/analyse.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/analyse.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/analyse.h -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/analyse.h Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/api.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/api.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * api.c: bit depth independent interface
  *****************************************************************************
- * Copyright (C) 2003-2022 x264 project
+ * Copyright (C) 2003-2023 x264 project
  *
  * Authors: Vittorio Giovara <vittorio.giovara@gmail.com>
  *          Luca Barbato <lu_zero@gentoo.org>
@@ -79,7 +79,8 @@
     if( !api )
         return NULL;
 
-    if( HAVE_BITDEPTH8 && param->i_bitdepth == 8 )
+#if HAVE_BITDEPTH8
+    if( param->i_bitdepth == 8 )
     {
         api->nal_encode = x264_8_nal_encode;
         api->encoder_reconfig = x264_8_encoder_reconfig;
@@ -94,7 +95,10 @@
 
         api->x264 = x264_8_encoder_open( param, api );
     }
-    else if( HAVE_BITDEPTH10 && param->i_bitdepth == 10 )
+    else
+#endif
+#if HAVE_BITDEPTH10
+    if( param->i_bitdepth == 10 )
     {
         api->nal_encode = x264_10_nal_encode;
         api->encoder_reconfig = x264_10_encoder_reconfig;
@@ -110,6 +114,7 @@
         api->x264 = x264_10_encoder_open( param, api );
     }
     else
+#endif
         x264_log_internal( X264_LOG_ERROR, "not compiled with %d bit depth support\n", param->i_bitdepth );
 
     if( !api->x264 )

x264-0.164+git20220602.baee400f.tar.xz/encoder/cabac.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/cabac.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/cavlc.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/cavlc.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/encoder.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/encoder.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/lookahead.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/lookahead.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/macroblock.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/macroblock.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/macroblock.h -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/macroblock.h Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/me.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/me.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/me.h -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/me.h Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/ratecontrol.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/ratecontrol.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/ratecontrol.h -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/ratecontrol.h Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/rdo.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/rdo.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/set.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/set.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/set.h -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/set.h Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/slicetype-cl.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/slicetype-cl.c Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/slicetype-cl.h -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/slicetype-cl.h Changed

x264-0.164+git20220602.baee400f.tar.xz/encoder/slicetype.c -> x264-0.164+git20231001.31e19f92.tar.xz/encoder/slicetype.c Changed

x264-0.164+git20220602.baee400f.tar.xz/example.c -> x264-0.164+git20231001.31e19f92.tar.xz/example.c Changed

x264-0.164+git20220602.baee400f.tar.xz/extras/intel_dispatcher.h -> x264-0.164+git20231001.31e19f92.tar.xz/extras/intel_dispatcher.h Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/filters.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/filters.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/filters.h -> x264-0.164+git20231001.31e19f92.tar.xz/filters/filters.h Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/cache.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/cache.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/crop.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/crop.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/depth.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/depth.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/fix_vfr_pts.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/fix_vfr_pts.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/internal.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/internal.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/internal.h -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/internal.h Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/resize.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/resize.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/select_every.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/select_every.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/source.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/source.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/video.c -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/video.c Changed

x264-0.164+git20220602.baee400f.tar.xz/filters/video/video.h -> x264-0.164+git20231001.31e19f92.tar.xz/filters/video/video.h Changed

x264-0.164+git20220602.baee400f.tar.xz/input/avs.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/avs.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/ffms.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/ffms.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/input.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/input.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/input.h -> x264-0.164+git20231001.31e19f92.tar.xz/input/input.h Changed

x264-0.164+git20220602.baee400f.tar.xz/input/lavf.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/lavf.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/raw.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/raw.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/thread.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/thread.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/timecode.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/timecode.c Changed

x264-0.164+git20220602.baee400f.tar.xz/input/y4m.c -> x264-0.164+git20231001.31e19f92.tar.xz/input/y4m.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/flv.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/flv.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/flv_bytestream.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/flv_bytestream.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/flv_bytestream.h -> x264-0.164+git20231001.31e19f92.tar.xz/output/flv_bytestream.h Changed

x264-0.164+git20220602.baee400f.tar.xz/output/matroska.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/matroska.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/matroska_ebml.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/matroska_ebml.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/matroska_ebml.h -> x264-0.164+git20231001.31e19f92.tar.xz/output/matroska_ebml.h Changed

x264-0.164+git20220602.baee400f.tar.xz/output/mp4.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/mp4.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/mp4_lsmash.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/mp4_lsmash.c Changed

x264-0.164+git20220602.baee400f.tar.xz/output/output.h -> x264-0.164+git20231001.31e19f92.tar.xz/output/output.h Changed

x264-0.164+git20220602.baee400f.tar.xz/output/raw.c -> x264-0.164+git20231001.31e19f92.tar.xz/output/raw.c Changed

x264-0.164+git20220602.baee400f.tar.xz/tools/checkasm-a.asm -> x264-0.164+git20231001.31e19f92.tar.xz/tools/checkasm-a.asm Changed

x264-0.164+git20220602.baee400f.tar.xz/tools/checkasm-aarch64.S -> x264-0.164+git20231001.31e19f92.tar.xz/tools/checkasm-aarch64.S Changed

x264-0.164+git20220602.baee400f.tar.xz/tools/checkasm-arm.S -> x264-0.164+git20231001.31e19f92.tar.xz/tools/checkasm-arm.S Changed

x264-0.164+git20220602.baee400f.tar.xz/tools/checkasm.c -> x264-0.164+git20231001.31e19f92.tar.xz/tools/checkasm.c Changed

x264-0.164+git20220602.baee400f.tar.xz/x264.c -> x264-0.164+git20231001.31e19f92.tar.xz/x264.c Changed

@@ -1,7 +1,7 @@
 /*****************************************************************************
  * x264: top-level x264cli functions
  *****************************************************************************
- * Copyright (C) 2003-2022 x264 project
+ * Copyright (C) 2003-2023 x264 project
  *
  * Authors: Loren Merritt <lorenm@u.washington.edu>
  *          Laurent Aimar <fenrir@via.ecp.fr>
@@ -1673,11 +1673,16 @@
     /* init threaded input while the information about the input video is unaltered by filtering */
 #if HAVE_THREAD
     const cli_input_t *thread_input;
-    if( HAVE_BITDEPTH8 && param->i_bitdepth == 8 )
+#if HAVE_BITDEPTH8
+    if( param->i_bitdepth == 8 )
         thread_input = &thread_8_input;
-    else if( HAVE_BITDEPTH10 && param->i_bitdepth == 10 )
+    else
+#endif
+#if HAVE_BITDEPTH10
+    if( param->i_bitdepth == 10 )
         thread_input = &thread_10_input;
     else
+#endif
         thread_input = NULL;
 
     if( thread_input && info.thread_safe && (b_thread_input || param->i_threads > 1
@@ -1797,18 +1802,26 @@
 {
     int num = -1;
     char type;
+    char buf100;
     while( num < i_frame )
     {
         int64_t file_pos = ftell( opt->qpfile );
         int qp = -1;
-        int ret = fscanf( opt->qpfile, "%d %c%* \t%d\n", &num, &type, &qp );
+        int ret = fscanf( opt->qpfile, " %99^\n\n", buf );
+        if( ret == 1 )
+        {
+            ret = sscanf( buf, "%d %c %d", &num, &type, &qp );
+            if( ret == EOF )
+                ret = 0;
+        }
         pic->i_type = X264_TYPE_AUTO;
         pic->i_qpplus1 = X264_QP_AUTO;
         if( num > i_frame || ret == EOF )
         {
-            if( file_pos < 0 || fseek( opt->qpfile, file_pos, SEEK_SET ) )
+            if( ret == EOF || file_pos < 0 || fseek( opt->qpfile, file_pos, SEEK_SET ) )
             {
-                x264_cli_log( "x264", X264_LOG_ERROR, "qpfile seeking failed\n" );
+                if( ret != EOF )
+                    x264_cli_log( "x264", X264_LOG_ERROR, "qpfile seeking failed\n" );
                 fclose( opt->qpfile );
                 opt->qpfile = NULL;
             }
@@ -1816,8 +1829,6 @@
         }
         if( num < i_frame && ret >= 2 )
             continue;
-        if( ret == 3 && qp >= 0 )
-            pic->i_qpplus1 = qp+1;
         if     ( type == 'I' ) pic->i_type = X264_TYPE_IDR;
         else if( type == 'i' ) pic->i_type = X264_TYPE_I;
         else if( type == 'K' ) pic->i_type = X264_TYPE_KEYFRAME;
@@ -1832,6 +1843,8 @@
             opt->qpfile = NULL;
             break;
         }
+        if( ret == 3 && qp >= 0 )
+            pic->i_qpplus1 = qp+1;
     }
 }

x264-0.164+git20220602.baee400f.tar.xz/x264.h -> x264-0.164+git20231001.31e19f92.tar.xz/x264.h Changed

x264-0.164+git20220602.baee400f.tar.xz/x264cli.h -> x264-0.164+git20231001.31e19f92.tar.xz/x264cli.h Changed

x264-0.164+git20220602.baee400f.tar.xz/x264dll.c -> x264-0.164+git20231001.31e19f92.tar.xz/x264dll.c Changed

x264-0.164+git20220602.baee400f.tar.xz/x264res.rc -> x264-0.164+git20231001.31e19f92.tar.xz/x264res.rc Changed

Overview

Request 6064 (accepted)

Request History