restored swscale and updated opengl fx spec

This commit is contained in:
itsmattkc
2018-08-20 12:36:53 +10:00
parent 951be4d223
commit b06ab214ea
26 changed files with 395 additions and 309 deletions
+1 -2
View File
@@ -25,8 +25,7 @@ Clip::Clip(Sequence* s) :
media(NULL),
opening_transition(NULL),
closing_transition(NULL),
pkt(new AVPacket()),
filter_graph(NULL),
pkt(new AVPacket()),
replaced(false),
texture(NULL)
{
+1 -7
View File
@@ -18,8 +18,6 @@ struct AVCodec;
struct AVCodecContext;
struct AVFrame;
struct AVPacket;
struct AVFilterGraph;
struct AVFilterContext;
struct SwsContext;
struct SwrContext;
class QOpenGLTexture;
@@ -81,11 +79,7 @@ struct Clip
AVFrame* frame;
uchar* comp_frame;
int comp_frame_size;
// ffmpeg filters
AVFilterGraph* filter_graph;
AVFilterContext* buffersink_ctx;
AVFilterContext* buffersrc_ctx;
SwsContext* sws_ctx;
bool pkt_written;
bool reached_end;
-4
View File
@@ -34,10 +34,6 @@ QUndoStack undo_stack;
#define TA_MODIFY_TRANSITION 11
#define TA_DELETE_TRANSITION 12
extern "C" {
#include "libavfilter/avfilter.h"
}
TimelineAction::TimelineAction() :
done(false),
change_seq(false),