Commit b388d5e4 authored by Michael Niedermayer's avatar Michael Niedermayer

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 20249 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f1cb9858
...@@ -408,6 +408,19 @@ int av_opt_show(void *obj, void *av_log_obj){ ...@@ -408,6 +408,19 @@ int av_opt_show(void *obj, void *av_log_obj){
void av_opt_set_defaults2(void *s, int mask, int flags) void av_opt_set_defaults2(void *s, int mask, int flags)
{ {
const AVOption *opt = NULL; 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) { while ((opt = av_next_option(s, opt)) != NULL) {
if((opt->flags & mask) != flags) if((opt->flags & mask) != flags)
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment