diff options
| author | Martin Storsjö <martin@martin.st> | 2012-08-31 13:35:47 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-09-04 23:16:11 +0300 |
| commit | 686a329395bf4b602445dd5015fab507b01ad4f2 (patch) | |
| tree | 54e128fec3886421340753b8155265add1761628 /libavutil | |
| parent | 21bc44038491e525335ad763883b0288402ff6a0 (diff) | |
| download | ffmpeg-686a329395bf4b602445dd5015fab507b01ad4f2.tar.gz | |
avopt: Reorder the default_val struct, making i64 the first field
Also mention this change in APIchanges.
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/opt.h b/libavutil/opt.h index 8f800fcf98..775267f9ea 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -261,10 +261,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 diff --git a/libavutil/version.h b/libavutil/version.h index 2dc821d8f1..293a65b08f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -37,7 +37,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 39 +#define LIBAVUTIL_VERSION_MINOR 40 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ |