[FFmpeg-cvslog] cmdutils: fix null pointer dereference

Michael Niedermayer git at videolan.org
Sun Feb 24 20:37:29 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 20:16:17 2013 +0100| [f3abdf4392a146462dc679846c061b8bf2b5c7a0] | committer: Michael Niedermayer

cmdutils: fix null pointer dereference

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

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

 cmdutils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmdutils.c b/cmdutils.c
index 50a1ff8..3e0dfbc 100644
--- a/cmdutils.c
+++ b/cmdutils.c
@@ -530,8 +530,8 @@ int opt_default(void *optctx, const char *opt, const char *arg)
 #endif
 #if CONFIG_AVRESAMPLE
     rc_class = avresample_get_class();
-    if (av_opt_find(&rc_class, opt, NULL, 0,
-                    AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ)) {
+    if ((o=av_opt_find(&rc_class, opt, NULL, 0,
+                       AV_OPT_SEARCH_CHILDREN | AV_OPT_SEARCH_FAKE_OBJ))) {
         av_dict_set(&resample_opts, opt, arg, FLAGS);
         consumed = 1;
     }



More information about the ffmpeg-cvslog mailing list