[SCM] libav/experimental: 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.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c69b3e0dc1b3bf9dca8352f575a6dd7a29aa9fdc
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Oct 17 19:35:47 2009 +0000

    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.
    
    Originally committed as revision 20264 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/opt.c b/libavcodec/opt.c
index 3a6f1f7..a6abcfc 100644
--- 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;

-- 
Libav/FFmpeg packaging