试图解决编译错误
# Conflicts: # app/codec/encoder.cpp # app/codec/encoder.h # app/codec/ffmpeg/ffmpegdecoder.cpp # ext/core
This commit is contained in:
+1
-1
@@ -33,7 +33,7 @@
|
||||
#include "render/colortransform.h"
|
||||
#include "render/subtitleparams.h"
|
||||
#include "render/videoparams.h"
|
||||
|
||||
//这个代码也许是导出编码视频用的?
|
||||
namespace olive {
|
||||
|
||||
class Encoder;
|
||||
|
||||
Reference in New Issue
Block a user