History

Merge pull request #395 from mstorsjo/printf-64bit-macro

Use a standard macro for 64 bit printf conversion specifiers

Ethan Hugg committed 12 years ago

Commit 1eb68822 parents e959368 3c7dde93 files · +6 −15Browse files

Showing the changes to codec/encoder/core/src/slice_multi_threading.cpp (1 of 3 files). Show all

Unified · Split

codec/encoder/core/src/slice_multi_threading.cpp+2−10
@@ -1232,11 +1232,7 @@ int32_t AdjustBaseLayer (sWelsEncCtx* pCtx) { · 1231 unmodified lines
12321232 iT0 = WelsTime() - iT0;
12331233 if (pCtx->pSliceThreading->pFSliceDiff) {
12341234 fprintf (pCtx->pSliceThreading->pFSliceDiff,
1235−#ifdef _WIN32
1236− "%6I64d us adjust time at base spatial layer, iNeedAdj %d, DynamicAdjustSlicing()\n",
1237−#else
1238− "%6lld us adjust time at base spatial layer, iNeedAdj %d, DynamicAdjustSlicing()\n",
1239−#endif//WIN32
1235+ "%6"PRId64" us adjust time at base spatial layer, iNeedAdj %d, DynamicAdjustSlicing()\n",
12401236 iT0, iNeedAdj);
12411237 }
12421238 #endif//MT_DEBUG
@@ -1283,11 +1279,7 @@ int32_t AdjustEnhanceLayer (sWelsEncCtx* pCtx, int32_t iCurDid) { · 40 unmodified lines
12831279 iT1 = WelsTime() - iT1;
12841280 if (pCtx->pSliceThreading->pFSliceDiff) {
12851281 fprintf (pCtx->pSliceThreading->pFSliceDiff,
1286−#ifdef _WIN32
1287− "%6I64d us adjust time at spatial layer %d, iNeedAdj %d, DynamicAdjustSlicing()\n",
1288−#else
1289− "%6lld us adjust time at spatial layer %d, iNeedAdj %d, DynamicAdjustSlicing()\n",
1290−#endif//WIN32
1282+ "%6"PRId64" us adjust time at spatial layer %d, iNeedAdj %d, DynamicAdjustSlicing()\n",
12911283 iT1, iCurDid, iNeedAdj);
12921284 }
12931285 #endif//MT_DEBUG

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