[FFmpeg-cvslog] r20249 - trunk/libavcodec/opt.c

[michael]

Author: michael
Date: Fri Oct 16 14:35:49 2009
New Revision: 20249

Log:
Very evil missuse of svn to test if AVOption and AVOption2 are compatible.
If this test triggers anywhere for anyone, revert this commit immedeatly.
Ill revert this in a day or 2, its just so we know beforehand if the idea
with the union is doable or not without breaking ABI/API.

Modified:
   trunk/libavcodec/opt.c

Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c	Fri Oct 16 14:31:32 2009	(r20248)
+++ trunk/libavcodec/opt.c	Fri Oct 16 14:35:49 2009	(r20249)
@@ -408,6 +408,19 @@ int av_opt_show(void *obj, void *av_log_
 void av_opt_set_defaults2(void *s, int mask, int flags)
 {
     const AVOption *opt = NULL;
+
+    if(   sizeof(AVOption) != sizeof(AVOption2)
+       || offsetof(AVOption,default_val) != offsetof(AVOption2,default_val.dbl)
+       || offsetof(AVOption,min) != offsetof(AVOption2,min)
+    ){
+        av_log(NULL, AV_LOG_ERROR, "AVOpt1/2 missmatch %zd %zd %td %td %td %td\n",
+               sizeof(AVOption), sizeof(AVOption2),
+               offsetof(AVOption,default_val), offsetof(AVOption2,default_val.dbl),
+               offsetof(AVOption,min), offsetof(AVOption2,min));
+#undef exit
+        exit(123);
+    }
+
     while ((opt = av_next_option(s, opt)) != NULL) {
         if((opt->flags & mask) != flags)
             continue;