Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 21:47:31 +0000 (22:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 21:47:40 +0000 (22:47 +0100)
* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
  cmdutils: don't log an error in opt_default().

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
cmdutils.c

diff --cc cmdutils.c
@@@ -524,9 -433,8 +524,8 @@@ int opt_default(void *optctx, const cha
      }
  #endif
  
 -    if (o)
 +    if (consumed)
          return 0;
-     av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt);
      return AVERROR_OPTION_NOT_FOUND;
  }