fix the conflict with the current master

2015-11-30 23:42:26 -08:00
parent 420778f4d8 ece95c815c
commit f38d24f036
4 changed files with 64 additions and 121 deletions
--- a/test/api/encode_decode_api_test.cpp
+++ b/test/api/encode_decode_api_test.cpp
@@ -373,3 +373,4 @@ int SimulateNALLoss (const unsigned char* pSrc,  int& iSrcLen, std::vector<SLost
  return iSkipedBytes;
 }

+