From 686a329395bf4b602445dd5015fab507b01ad4f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 31 Aug 2012 13:35:47 +0300 Subject: [PATCH] avopt: Reorder the default_val struct, making i64 the first field MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also mention this change in APIchanges. Signed-off-by: Martin Storsjö --- doc/APIchanges | 4 ++++ libavutil/opt.h | 2 +- libavutil/version.h | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index dda0996b93..7e1ffd0801 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -13,6 +13,10 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-09-04 - xxxxxxx - lavu 51.40.0 - opt.h + Reordered the fields in default_val in AVOption, changed which + default_val field is used for which AVOptionType. + 2012-xx-xx - xxxxxxx - lavc 54.26.1 - avcodec.h Add codec descriptor properties AV_CODEC_PROP_LOSSY and AV_CODEC_PROP_LOSSLESS. 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, \