projects
/
ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'qatar/master'
[ffmpeg.git]
/
libavutil
/
opt.h
diff --git
a/libavutil/opt.h
b/libavutil/opt.h
index
3bf30a5
..
ea22616
100644
(file)
--- a/
libavutil/opt.h
+++ b/
libavutil/opt.h
@@
-263,10
+263,10
@@
typedef struct AVOption {
* the default value for scalar options
*/
union {
+ int64_t i64;
double dbl;
const char *str;
/* TODO those are unused now */
- int64_t i64;
AVRational q;
} default_val;
double min; ///< minimum valid value for the option