History

fix the conflict with the current master

sijchen committed 10 years ago

Commit f38d24f2 parents 420778f ece95c84 files · +64 −121Browse files

Showing the changes to test/api/encode_decode_api_test.cpp (1 of 4 files). Show all

Unified · Split

test/api/encode_decode_api_test.cpp+1−0
@@ -373,3 +373,4 @@ int SimulateNALLoss (const unsigned char* pSrc, int& iSrcLen, std::vector<SLost · 372 unmodified lines
373373 return iSkipedBytes;
374374 }
375375
376+

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t