bsd/cygwin patch sync, ffmpeg color_space/color_range fix

[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / ffmpeg.h

diff --git a/cinelerra-5.1/cinelerra/ffmpeg.h b/cinelerra-5.1/cinelerra/ffmpeg.h
index 9e17d8b9024fda0a7b135175d78c6eb41f532c8c..46838b4d92dca56ee8bc0625554ef5b48d0aff3a 100644 (file)
--- a/cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/cinelerra-5.1/cinelerra/ffmpeg.h
@@ -20,6 +20,7 @@
 #include "fileffmpeg.inc"
 #include "indexstate.inc"
 #include "mutex.h"
+#include "preferences.inc"
 #include "thread.h"
 #include "vframe.inc"
 
@@ -204,10 +205,14 @@ public:
 
 class FFVideoConvert {
 public:
+       Preferences *preferences;
        struct SwsContext *convert_ctx;
        AVFrame *sw_frame;
 
-       FFVideoConvert() { convert_ctx = 0; sw_frame = 0; }
+       FFVideoConvert(Preferences *preferences) {
+               this->preferences = preferences;
+               convert_ctx = 0; sw_frame = 0;
+       }
        ~FFVideoConvert() {
                if( convert_ctx ) sws_freeContext(convert_ctx);
                if( sw_frame ) av_frame_free(&sw_frame);
@@ -412,6 +417,7 @@ public:
 
        int ff_cpus();
        const char *ff_hw_dev();
+       Preferences *ff_prefs();
        void dump_context(AVCodecContext *ctx);
 };