Mercurial > libavcodec.hg
changeset 10423:2e4967487e59 libavcodec
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.
| author | michael |
|---|---|
| date | Sat, 17 Oct 2009 19:35:47 +0000 |
| parents | 1c33160b0722 |
| children | 94595d0e617c |
| files | opt.c |
| diffstat | 1 files changed, 0 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- 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;