[Ffmpeg-cvslog] r8280 - in trunk/libavcodec: opt.c opt.h

[michael]

Author: michael
Date: Wed Mar  7 03:21:35 2007
New Revision: 8280

Modified:
   trunk/libavcodec/opt.c
   trunk/libavcodec/opt.h

Log:
add av_opt_set_defaults2() which sets just defaults from AVOptions whos flags match a user specified & mask = flags


Modified: trunk/libavcodec/opt.c
==============================================================================
--- trunk/libavcodec/opt.c	(original)
+++ trunk/libavcodec/opt.c	Wed Mar  7 03:21:35 2007
@@ -343,10 +343,12 @@ int av_opt_show(void *obj, void *av_log_
  *
  * @param s AVCodecContext or AVFormatContext for which the defaults will be set
  */
-void av_opt_set_defaults(void *s)
+void av_opt_set_defaults2(void *s, int mask, int flags)
 {
     const AVOption *opt = NULL;
     while ((opt = av_next_option(s, opt)) != NULL) {
+        if((opt->flags & mask) != flags)
+            continue;
         switch(opt->type) {
             case FF_OPT_TYPE_CONST:
                 /* Nothing to be done here */
@@ -379,3 +381,7 @@ void av_opt_set_defaults(void *s)
     }
 }
 
+void av_opt_set_defaults(void *s){
+    av_opt_set_defaults2(s, 0, 0);
+}
+

Modified: trunk/libavcodec/opt.h
==============================================================================
--- trunk/libavcodec/opt.h	(original)
+++ trunk/libavcodec/opt.h	Wed Mar  7 03:21:35 2007
@@ -80,5 +80,6 @@ const char *av_get_string(void *obj, con
 const AVOption *av_next_option(void *obj, const AVOption *last);
 int av_opt_show(void *obj, void *av_log_obj);
 void av_opt_set_defaults(void *s);
+void av_opt_set_defaults2(void *s, int mask, int flags);
 
 #endif