diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 15:02:17 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-05 15:02:17 +0200 |
| commit | b21b5b04cca0633bd88db972ff1187ab7825b667 (patch) | |
| tree | b7e2b1d8d03dffdec3daa03cfcd46b4f3537a418 /libavutil/opt.h | |
| parent | 8510150f48ef3a2008f97af6c4618f150a60edd7 (diff) | |
| parent | 6980453569b09239d3fcc4cc7335956f36e484d4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: eamad: Add missing dependency on mpegvideo code
build: utvideoenc: Add missing dependency on Huffman code
avopt: Reorder the default_val struct, making i64 the first field
Conflicts:
configure
doc/APIchanges
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/opt.h')
| -rw-r--r-- | libavutil/opt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h index 3bf30a582d..ea22616b09 100644 --- 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 |