shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge changes I18407622,I34057b87 into experimental

* changes:
  fix a crash in 2-pass encoding with test-decode on
  enable build on windows with msvc

--- a/build/x86-msvs/obj_int_extract.bat

+++ b/build/x86-msvs/obj_int_extract.bat

@@ -10,6 +10,6 @@

 cl /I "./" /I "%1" /nologo /c "%1/vp9/common/asm_com_offsets.c"

 cl /I "./" /I "%1" /nologo /c "%1/vp9/decoder/asm_dec_offsets.c"

 cl /I "./" /I "%1" /nologo /c "%1/vp9/encoder/asm_enc_offsets.c"

-obj_int_extract.exe rvds "asm_com_offsets.obj" > "asm_com_offsets.asm"

-obj_int_extract.exe rvds "asm_dec_offsets.obj" > "asm_dec_offsets.asm"

-obj_int_extract.exe rvds "asm_enc_offsets.obj" > "asm_enc_offsets.asm"

+obj_int_extract.exe rvds "asm_com_offsets.obj" > "vp9_asm_com_offsets.asm"

+obj_int_extract.exe rvds "asm_dec_offsets.obj" > "vp9_asm_dec_offsets.asm"

+obj_int_extract.exe rvds "asm_enc_offsets.obj" > "vp9_asm_enc_offsets.asm"

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -2418,7 +2418,7 @@

         got_data = 0;

         FOREACH_STREAM(get_cx_data(stream, &global, &got_data));

-        if (global.test_decode)

+        if (got_data && global.test_decode)

           FOREACH_STREAM(test_decode(stream, frames_in));

       }