projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Hand-apply d849d411cff28ef5453085791d0b4d7cd73bd070 from master; replace all assert...
[dcpomatic.git]
/
src
/
lib
/
scaler.cc
diff --git
a/src/lib/scaler.cc
b/src/lib/scaler.cc
index 40a0f05b93e68ca5794b4e59a937f8e98dffcc13..43c1ac81cb4213ec43895e7c0412ab0c802c16d9 100644
(file)
--- a/
src/lib/scaler.cc
+++ b/
src/lib/scaler.cc
@@
-21,12
+21,13
@@
* @brief A class to describe one of FFmpeg's software scalers.
*/
* @brief A class to describe one of FFmpeg's software scalers.
*/
-#include
<iostream>
-#include
<cassert>
+#include
"dcpomatic_assert.h"
+#include
"scaler.h"
extern "C" {
#include <libswscale/swscale.h>
}
extern "C" {
#include <libswscale/swscale.h>
}
-#include "scaler.h"
+#include <iostream>
+#include <cassert>
#include "i18n.h"
#include "i18n.h"
@@
-112,6
+113,6
@@
Scaler::as_index (Scaler const * s)
Scaler const *
Scaler::from_index (int i)
{
Scaler const *
Scaler::from_index (int i)
{
-
assert
(i <= int(_scalers.size ()));
+
DCPOMATIC_ASSERT
(i <= int(_scalers.size ()));
return _scalers[i];
}
return _scalers[i];
}