diff --git a/src/Lib/AbstractMediaContext.hh b/src/Lib/AbstractMediaContext.hh
index 94d8f815b6da300e3411dd171709d28f458131e7..34b3c8aba50396cec1f371351343f552eb3518f7 100644
--- a/src/Lib/AbstractMediaContext.hh
+++ b/src/Lib/AbstractMediaContext.hh
@@ -157,9 +157,9 @@ public:
// Populate all the stream indexes
for (uint i = 0; i < format->nb_streams; ++i) {
- AVStream *itFmt = format->streams[i];
- AVCodecParameters *params = itFmt->codecpar;
- const AVCodec *streamCodec = avcodec_find_decoder(params->codec_id);
+ AVStream *itFmt = format->streams[i];
+ AVCodecParameters *params = itFmt->codecpar;
+ const AVCodec *streamCodec = avcodec_find_decoder(params->codec_id);
if (streamCodec && streamCodec->type == avMediaType)
audioStreams.insert(i, std::make_shared<Stream>(streamCodec, formatPtr, itFmt, i));
}
diff --git a/src/Lib/Ass/Line.hh b/src/Lib/Ass/Line.hh
index 20fd4ac453a7cf4ca9ebeb30c849f2784efdc674..4895622cd25001191ae2912d55df42e3e197205c 100644
--- a/src/Lib/Ass/Line.hh
+++ b/src/Lib/Ass/Line.hh
@@ -32,7 +32,7 @@ public:
//explicit Line(const Line &) = default;
explicit Line(AssFactory *const, const QString &);
explicit Line();
- explicit Line(const Line &c) = default;
+ explicit Line(const Line &c) = default;
Line &operator=(const Line &) = delete;
~Line() noexcept = default;
diff --git a/src/Lib/Audio.cc b/src/Lib/Audio.cc
index 2842e53853fa134f04247b0283c4b5fd66661fae..716251647fff8a4b23e627affd66eda90ffda3a0 100644
--- a/src/Lib/Audio.cc
+++ b/src/Lib/Audio.cc
@@ -25,8 +25,8 @@ AudioContext::getProperties() const noexcept
// AudioStream class implementation
// Constructor, need an AVFormat and an AVStream
-AudioStream::AudioStream(const AVCodec *streamCodec, AVFormatContext *formatPtr, AVStream *streamArg,
- int index)
+AudioStream::AudioStream(const AVCodec *streamCodec, AVFormatContext *formatPtr,
+ AVStream *streamArg, int index)
: Super(streamCodec, formatPtr, streamArg, index)
{
SwrContext *s = dataSwrContext.get();
diff --git a/src/Lib/Script/CRTPLuaScriptObject.hh b/src/Lib/Script/CRTPLuaScriptObject.hh
index d90a5fb8f23ff84cc4491fbbad992de95d7b5945..25f9d11f39ed2060feba0fdd271dcc90cc1b5d2f 100644
--- a/src/Lib/Script/CRTPLuaScriptObject.hh
+++ b/src/Lib/Script/CRTPLuaScriptObject.hh
@@ -247,10 +247,10 @@ script_class (JobDeclaration) {
method_list metaMethods = { luaRegDefaultGC,
LUA_DECL_META_METHOD(JobDeclaration, "__tostring", TOSTRING) };
method_list methods = { LUA_DECL_METHOD(JobDeclaration, setName),
- LUA_DECL_METHOD(JobDeclaration, setOptions),
- LUA_DECL_METHOD(JobDeclaration, setImportFromScript),
- LUA_DECL_METHOD(JobDeclaration, pushToRuntime),
- LUA_DECL_CREATE(JobDeclaration) };
+ LUA_DECL_METHOD(JobDeclaration, setOptions),
+ LUA_DECL_METHOD(JobDeclaration, setImportFromScript),
+ LUA_DECL_METHOD(JobDeclaration, pushToRuntime),
+ LUA_DECL_CREATE(JobDeclaration) };
bool isImported{ false };
int functionRegisterKey{ -1 };
@@ -280,9 +280,9 @@ script_class (FunctionDeclaration) {
method_list metaMethods = { luaRegDefaultGC,
LUA_DECL_META_METHOD(FunctionDeclaration, "__tostring", TOSTRING) };
method_list methods = { LUA_DECL_METHOD(FunctionDeclaration, setName),
- LUA_DECL_METHOD(FunctionDeclaration, setImportFromScript),
- LUA_DECL_METHOD(FunctionDeclaration, pushToRuntime),
- LUA_DECL_CREATE(FunctionDeclaration) };
+ LUA_DECL_METHOD(FunctionDeclaration, setImportFromScript),
+ LUA_DECL_METHOD(FunctionDeclaration, pushToRuntime),
+ LUA_DECL_CREATE(FunctionDeclaration) };
bool isImported{ false };
int functionRegisterKey{ -1 };
@@ -316,18 +316,18 @@ script_class (ModuleDeclaration) {
method_list metaMethods = { luaRegDefaultGC };
method_list methods = {
- LUA_DECL_METHOD(ModuleDeclaration, setName),
- LUA_DECL_METHOD(ModuleDeclaration, setDescription),
- LUA_DECL_METHOD(ModuleDeclaration, setRevision),
- LUA_DECL_METHOD(ModuleDeclaration, setAuthorName),
- LUA_DECL_METHOD(ModuleDeclaration, setImports),
- LUA_DECL_METHOD(ModuleDeclaration, setOptions),
- LUA_DECL_METHOD(ModuleDeclaration, setFunctions),
- LUA_DECL_METHOD(ModuleDeclaration, setJobs),
- LUA_DECL_METHOD(ModuleDeclaration, pushToRuntime),
- LUA_DECL_NAMED_METHOD(ModuleDeclaration, "import", importMethod),
- LUA_DECL_NAMED_METHOD(ModuleDeclaration, "export", exportMethod),
- LUA_DECL_CREATE(ModuleDeclaration),
+ LUA_DECL_METHOD(ModuleDeclaration, setName),
+ LUA_DECL_METHOD(ModuleDeclaration, setDescription),
+ LUA_DECL_METHOD(ModuleDeclaration, setRevision),
+ LUA_DECL_METHOD(ModuleDeclaration, setAuthorName),
+ LUA_DECL_METHOD(ModuleDeclaration, setImports),
+ LUA_DECL_METHOD(ModuleDeclaration, setOptions),
+ LUA_DECL_METHOD(ModuleDeclaration, setFunctions),
+ LUA_DECL_METHOD(ModuleDeclaration, setJobs),
+ LUA_DECL_METHOD(ModuleDeclaration, pushToRuntime),
+ LUA_DECL_NAMED_METHOD(ModuleDeclaration, "import", importMethod),
+ LUA_DECL_NAMED_METHOD(ModuleDeclaration, "export", exportMethod),
+ LUA_DECL_CREATE(ModuleDeclaration),
};
// Will be resolved later
@@ -367,12 +367,12 @@ script_class (FreeFunctions) {
method_list metaMethods = { luaRegDefaultGC };
method_list methods = { LUA_DECL_METHOD(FreeFunctions, getModule),
- LUA_DECL_METHOD(FreeFunctions, start),
- LUA_DECL_METHOD(FreeFunctions, finish),
- LUA_DECL_METHOD(FreeFunctions, width),
- LUA_DECL_METHOD(FreeFunctions, height),
- LUA_DECL_METHOD(FreeFunctions, print),
- LUA_DECL_CREATE(FreeFunctions) };
+ LUA_DECL_METHOD(FreeFunctions, start),
+ LUA_DECL_METHOD(FreeFunctions, finish),
+ LUA_DECL_METHOD(FreeFunctions, width),
+ LUA_DECL_METHOD(FreeFunctions, height),
+ LUA_DECL_METHOD(FreeFunctions, print),
+ LUA_DECL_CREATE(FreeFunctions) };
int videoWidth{ 0 }, videoHeight{ 0 };
int audioStart{ 0 }, audioFinish{ 0 };
diff --git a/src/Lib/Utils.hh b/src/Lib/Utils.hh
index 39a6bc79895b010ea85cf826c7c4a4604c1d63e9..898c73ca2428f50c859bba2ccf12a43162bb1216 100644
--- a/src/Lib/Utils.hh
+++ b/src/Lib/Utils.hh
@@ -39,7 +39,7 @@ using chrono::duration_cast;
// Disable copy and move assign operators
#define VIVY_DISABLE_ASSIGN_OPERATORS(classname) \
classname &operator=(const classname &) = delete; /* Copy assign */ \
- classname &operator=(classname &&) = delete; /* Move assign */
+ classname &operator=(classname &&) = delete; /* Move assign */
#define VIVY_DISABLE_COPY_CTOR(classname) classname(const classname &) = delete; /* Copy */
#define VIVY_DISABLE_MOVE_CTOR(classname) classname(classname &&) = delete; /* Move */
@@ -113,7 +113,7 @@ namespace Vivy::Utils
enum OsType { OsTypeWindows, OsTypeLinux, OsTypeMac, OsTypeOtherUnix, OsTypeOther };
static const QStringList audioFileSuffix = { "wave", "wav", "ogg", "mp3", "m4a",
- "opus", "mp2", "aiff", "flac", "alac" };
+ "opus", "mp2", "aiff", "flac", "alac" };
static const QStringList videoFileSuffix = { "mkv", "mp4", "mov", "avi", "av1", "m4v", "flv" };
static const QStringList assFileSuffix = { "ass" };
static const QStringList vivyFileSuffix = { "vivy" };
diff --git a/src/Lib/Video.cc b/src/Lib/Video.cc
index 7845548606956b97f4061399bb679ba611c6fd9d..3e2566c8949646bbf68c8d5adb3b79afa72f1d87 100644
--- a/src/Lib/Video.cc
+++ b/src/Lib/Video.cc
@@ -3,8 +3,8 @@
using namespace Vivy;
-VideoStream::VideoStream(const AVCodec *streamCodec, AVFormatContext *formatArg, AVStream *streamArg,
- int index)
+VideoStream::VideoStream(const AVCodec *streamCodec, AVFormatContext *formatArg,
+ AVStream *streamArg, int index)
: Super(streamCodec, formatArg, streamArg, index)
{
}