projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add hw_dev preference, opts file var, tweak hw GPU xfer err msg
[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 9656bf3970914db5ab27dee24dc2d91188bec8bf..15659944c9b3ef57ae599e2eac3527099b438db0 100644
(file)
--- a/
cinelerra-5.1/cinelerra/ffmpeg.h
+++ b/
cinelerra-5.1/cinelerra/ffmpeg.h
@@
-132,7
+132,6
@@
public:
int reading, writing;
int seeked, eof;
int reading, writing;
int seeked, eof;
- const char *hw_dev;
int hw_pixfmt;
AVBufferRef *hw_device_ctx;
int hw_pixfmt;
AVBufferRef *hw_device_ctx;
@@
-326,6
+325,7
@@
public:
double opt_duration;
char *opt_video_filter;
char *opt_audio_filter;
double opt_duration;
char *opt_video_filter;
char *opt_audio_filter;
+ char *opt_hw_dev;
char file_format[BCTEXTLEN];
int fflags;
char file_format[BCTEXTLEN];
int fflags;
@@
-388,6
+388,7
@@
public:
int ff_video_mpeg_color_range(int stream);
int ff_cpus();
int ff_video_mpeg_color_range(int stream);
int ff_cpus();
+ const char *ff_hw_dev();
void dump_context(AVCodecContext *ctx);
};
void dump_context(AVCodecContext *ctx);
};