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

Merge pull request #95 from ethanhugg/travis2

Browse Source 
Add release builds (ASM) to Travis
This commit is contained in:
ekr 2014-01-05 20:00:45 -08:00
commit 42389008a3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -7,7 +7,7 @@ branches:
- gh-pages
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev
- sudo apt-get install -qq nasm g++-4.6-multilib gcc-multilib libc6-dev-i386 lib32z1-dev
install: make gtest-bootstrap
script: make && make test && make clean && make ENABLE64BIT=Yes && make test
script: make && make test && make clean && make ENABLE64BIT=Yes && make test && make clean && make BUILDTYPE=Release && make test && make BUILDTYPE=Release clean && make ENABLE64BIT=Yes BUILDTYPE=Release && make test

6
codec/console/dec/src/h264dec.cpp
View File

@ -141,7 +141,11 @@ void_t H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, co
goto label_exit;
}
fread (pBuf, 1, iFileSize, pH264File);
if (fread (pBuf, 1, iFileSize, pH264File) != iFileSize) {
fprintf (stderr, "Unable to read whole file\n");
goto label_exit;
}
memcpy (pBuf + iFileSize, &uiStartCode[0], 4); //confirmed_safe_unsafe_usage
if (pDecoder->SetOption (DECODER_OPTION_DATAFORMAT, &iColorFormat)) {