[FFmpeg-devel] [PATCH] lavu/opt: fix range check logic in set_format()

Stefano Sabatini stefasab at gmail.com
Mon Dec 16 16:04:11 CET 2013


In particular, allow to reject undefined values. Previously the code
was only accepting values in the range -1 .. NB_FORMATS-1.
---
 libavutil/opt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavutil/opt.c b/libavutil/opt.c
index f6aa496..9f531e4 100644
--- a/libavutil/opt.c
+++ b/libavutil/opt.c
@@ -559,8 +559,8 @@ static int set_format(void *obj, const char *name, int fmt, int search_flags,
     } else
 #endif
     {
-        min = FFMIN(o->min, -1);
-        max = FFMAX(o->max, nb_fmts-1);
+        min = FFMAX(o->min, -1);
+        max = FFMIN(o->max, nb_fmts-1);
     }
     if (fmt < min || fmt > max) {
         av_log(obj, AV_LOG_ERROR,
-- 
1.8.1.2



More information about the ffmpeg-devel mailing list