Merge pull request #2292 from ruil2/trace
Merge pull request #2289 from ruil2/interface1
Merge pull request #2285 from sijchen/ut13
Merge pull request #2286 from sijchen/ut3
Merge pull request #2284 from sijchen/rf2
fix the conflict with the current master
Merge pull request #2287 from GuangweiWang/bugfix
add valid adjustment in test to avoid outputing warning trace
update win UT project after UT structure change
moving test cases to specific files to avoid the too long encode_decode_api_test.cpp
Refactor: remove CWelsTaskManageMultiD
Merge pull request #2281 from sijchen/th11
Merge pull request #2273 from sijchen/th0
Merge pull request #2272 from sijchen/rf0
Merge pull request #2283 from shihuade/MultiThread_V4.3_SliceBs_V2
initial for iReturn and refact PPS Sps bs write function
Merge pull request #2282 from shihuade/MultiThread_V4.3_SliceBs_V1_Pull
Merge pull request #2277 from ruil2/qp_trace
Merge pull request #2276 from shihuade/MultiThread_V4.2_SSliceCtx_pSliceCountInMB_V3
add minqp and maxqp parameters in console
adjust the input para judgement of iMaxNalSize
remove duplicated operation after thread pool and rename a task for clearer meaning
remove pCountMbNumInSlice from SSliceCtx
Merge pull request #2275 from HaiboZhu/Fix_Emulation_Prevention_Bytes_Profiles_Bugs
Merge pull request #2271 from sijchen/rf1
Add protection for emulation prevention bytes and profile_id
Merge pull request #2274 from shihuade/MultiThread_V4.2_SSliceCtx_PFirstMBInSlice_Pull_BugFixed
Merge pull request #2266 from sijchen/ut0
Merge pull request #2270 from huili2/parseonly_api_bugfix
fixed bug for firsMbIndex in multi-thread-slice encoding with slicemode==SM_SIZELIMITED_SLICE
use different task when load-balancing or not to save computation
Merge pull request #2264 from sijchen/api41
Merge pull request #2269 from shihuade/MultiThread_V4.2_SSliceCtx_pSliceComplexRatio_pull
put duplicated codes into one function
disable wrongly calling for parseonly related
remove pSliceComplexRatio from SliceThreading
Merge pull request #2268 from HaiboZhu/Update_ftell_fseek_support_long_file
Merge pull request #2267 from shihuade/MultiThread_V4.2_SSliceCtx_SliceConSumeTime_Pull
Update the ftell and fseek to support 64bit length
remove pSliceConsumeTime in SSliceCtx and pSliceThreading
put class notification to header file
update the usage of flag and MD5 value
Merge pull request #2262 from shihuade/MultiThread_V4.2_SSliceCtx_PFirstMBInSlice_Pull
remove pFirstMbInSlice in SSliceCtx
Merge pull request #2261 from mstorsjo/fix-test-init-uninit
Readd a test for GetOption in TestInitUninit
Fully initialize m_sDecParam in TestInitUninit
Merge pull request #2260 from shihuade/MultiThread_V4.1_SliceCtx_V10V11_Pull_V4
change input parameters for UpdateMbNeighbourInfoForNextSlice etc.
Merge pull request #2258 from shihuade/MultiThread_V4.1_SliceCtx_V6V7V8V9_Pull_V2
change input parameters for DynamicAdjustSlicePEncCtxAll etc, SSliceCtx refactoring
Merge pull request #2257 from shihuade/MultiThread_V4.1_SliceCtx_V5_Pull
Merge pull request #2256 from shihuade/MultiThread_V4.1_SliceCtx_V4_Pull_V3
SSliceCtx structure refactoring----change input parameters for AssignMbMapMultipleSlices
SSliceCtx struture refactoring----change input paramters for Init/UninitSlicePEncCtx()
Merge pull request #2255 from shihuade/MultiThread_V4.1_SliceCtx_V3_Pull_V3
remove (ppCtx)->pSliceCtxList and only keep DqLayer->sSliceCtx to simply the structure manage
Merge pull request #2249 from huili2/remove_output_colorformat
Merge pull request #2251 from luser/plugin-name
Merge pull request #2246 from shihuade/MultiThread_V4.1_SliceCtx_V2_Pull
Merge pull request #2245 from shihuade/MultiThread_V4.1_SliceCtx_V1_Pull_V2
add an echo-plugin-name target
SSliceCtx struture refactoring----change input paramters for UpdateSlicepEncCtxWithPartition
SSliceCtx struture refactoring----change input paramters for UpdateMbListNeighborParallel
Merge pull request #2244 from pengyanhai/master
remove API data format in decoder in 1.6
Update the plugin version to v1.5.2
Shut down the encoder/decoder thread when Encoding/DecodingComplete is invoked, to avoid potential crash on Android
Avoid to call any host API after Encoding/DecodingComplete(), to avoid potential crash in the browser
Merge branch 'master' of github.com:pengyanhai/openh264
Merge pull request #2240 from ruil2/qp_trace
Merge pull request #2239 from ruil2/remove_trace
Merge pull request #2241 from shihuade/MultiThread_V4.0_ThreadPoolChange_V5_astyle
astyle for codec/encoder/core/src/slice_multi_threading.cpp
remove iAbsDiffPicNumMinus1 processing for no reference frame
Merge pull request #2236 from sijchen/thp82
Merge pull request #2238 from shihuade/MultiThread_V4.0_ThreadPoolChange_V2
add error handling of task returns
Merge pull request #2224 from sijchen/thp73
Merge pull request #2234 from HaiboZhu/Revert_Simply_Dec_Ctx
Revert "Merge pull request #2217 from huili2/simply_dec_ctx"
Merge pull request #2232 from ruil2/fix_crash_1
Merge pull request #2227 from sijchen/thp92
Merge pull request #2220 from sijchen/thp61
fix the missing loadbalancing part
[Encoder] put the logic related to multiple D layer into a class for better structure
Merge pull request #2219 from sijchen/api3
Merge pull request #2217 from huili2/simply_dec_ctx
Generate PDB file for openh264.dll and gmpopenh264.dll
change API for slicing part for easier usage (the UseLoadBalancing flag is still under working)