generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge changes I18407622,I34057b87 into experimental

Browse Source 
* changes:
  fix a crash in 2-pass encoding with test-decode on
  enable build on windows with msvc
This commit is contained in:
Yaowu Xu 2012-11-08 16:30:53 -08:00 committed by Gerrit Code Review
commit 7ab951d8cc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/x86-msvs/obj_int_extract.bat
View File

@ -10,6 +10,6 @@ echo on
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"

2
vpxenc.c
View File

@ -2418,7 +2418,7 @@ int main(int argc, const char **argv_) {
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));
}