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.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@20264 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 3a6f1f714636b9a8f675396b53f6291708e4c332..a6abcfc2e7d8ad40b89fb8536bfa18cdc44a2f82 100644 (file)
--- a/libavcodec/opt.c
+++ b/libavcodec/opt.c
@@ -408,19 +408,6 @@ int av_opt_show(void *obj, void *av_log_obj){
 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;