# HG changeset patch
# User michael
# Date 1255808147 0
# Node ID 2e4967487e59d3e6473486244f1d47d29c2c2086
# Parent  1c33160b072238263682cf832eec9fdab67ce2e2
Revert r20249, it seems the union trick works everywhere
Original commit message:
	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.

diff -r 1c33160b0722 -r 2e4967487e59 opt.c
--- a/opt.c	Sat Oct 17 08:04:33 2009 +0000
+++ b/opt.c	Sat Oct 17 19:35:47 2009 +0000
@@ -408,19 +408,6 @@
 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;