[FFmpeg-cvslog] r20264 - trunk/libavcodec/opt.c
michael
subversion
Sat Oct 17 21:35:47 CEST 2009
Author: michael
Date: Sat Oct 17 21:35:47 2009
New Revision: 20264
Log:
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.
Modified:
trunk/libavcodec/opt.c
Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c Sat Oct 17 16:07:28 2009 (r20263)
+++ trunk/libavcodec/opt.c Sat Oct 17 21:35:47 2009 (r20264)
@@ -408,19 +408,6 @@ int av_opt_show(void *obj, void *av_log_
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;
More information about the ffmpeg-cvslog
mailing list