diff options
| -rwxr-xr-x | rotord/ofxMovieExporter.h | 4 | ||||
| -rwxr-xr-x | rotord/rotor.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/rotord/ofxMovieExporter.h b/rotord/ofxMovieExporter.h index 5433812..28447d7 100755 --- a/rotord/ofxMovieExporter.h +++ b/rotord/ofxMovieExporter.h @@ -79,7 +79,7 @@ extern "C" #include <libswscale/swscale.h> //rest needed audio loader #include <libavutil/opt.h> - #include <libavutil/channel_layout.h> + //#include <libavutil/channel_layout.h> #include <libavutil/common.h> #include <libavutil/imgutils.h> @@ -161,7 +161,7 @@ class ofxMovieExporter float frameInterval; float aframeInterval; float lastFrameTime; - + std::string outFileName; AVOutputFormat* outputFormat; diff --git a/rotord/rotor.h b/rotord/rotor.h index 186d25b..c38a83f 100755 --- a/rotord/rotor.h +++ b/rotord/rotor.h @@ -638,15 +638,10 @@ namespace Rotor { libav::Audioloader audioloader; }; class Video_loader: public Image_node { - //video input using gstreamer - //seems slow - //TODO: scaling public: Video_loader(){}; Video_loader(map<string,string> &settings) { base_settings(settings); - //player=new ofGstVideoPlayer(); - //image=new Image(); isLoaded=false; }; ~Video_loader(){}; @@ -654,7 +649,6 @@ namespace Rotor { Image *output(const Frame_spec &frame); Video_loader* clone(map<string,string> &_settings) { return new Video_loader(_settings);}; private: - //ofGstVideoPlayer *player; libav::decoder player; Image image; bool isLoaded; |