[FFmpeg-cvslog] avopt: Fix searching for constants

Michael Niedermayer git at videolan.org
Thu Sep 8 05:44:01 CEST 2011


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep  8 05:27:01 2011 +0200| [0962ad0e2f86369cfac60f2300ced1702a95630a] | committer: Michael Niedermayer

avopt: Fix searching for constants
Fixes Ticket350

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0962ad0e2f86369cfac60f2300ced1702a95630a
---

 libavutil/opt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index 2d4f873..d749259 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -575,7 +575,7 @@ const AVOption *av_opt_find(void *obj, const char *name, const char *unit,
     while (o = av_next_option(obj, o)) {
         if (!strcmp(o->name, name) && (o->flags & opt_flags) == opt_flags &&
             ((!unit && o->type != FF_OPT_TYPE_CONST) ||
-             (unit  && o->unit && !strcmp(o->unit, unit))))
+             (unit  && o->type == FF_OPT_TYPE_CONST && o->unit && !strcmp(o->unit, unit))))
             return o;
     }
     return NULL;



More information about the ffmpeg-cvslog mailing list