diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-01 18:01:32 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-01 18:01:32 -0300 |
| commit | 26868f80e0255483df7de97b3b225a836ef33e60 (patch) | |
| tree | 2ade0d4ac5bb3466c18e43690cbb140e5e6c6d71 /fftools/cmdutils.c | |
| parent | 8e8d4cf83274c82f7cc33874bba073781804049e (diff) | |
| parent | 908f737d6c2900b5d34319ca6ea1d1cb71221463 (diff) | |
| download | ffmpeg-26868f80e0255483df7de97b3b225a836ef33e60.tar.gz | |
Merge commit '908f737d6c2900b5d34319ca6ea1d1cb71221463'
* commit '908f737d6c2900b5d34319ca6ea1d1cb71221463':
cmdutils: Mark conditionally used variable as av_unused
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'fftools/cmdutils.c')
| -rw-r--r-- | fftools/cmdutils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index 3d428f3eea..6920ca0764 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -38,6 +38,7 @@ #include "libswscale/swscale.h" #include "libswresample/swresample.h" #include "libpostproc/postprocess.h" +#include "libavutil/attributes.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" #include "libavutil/bprint.h" @@ -1702,7 +1703,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg) #endif while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) { - enum AVPixelFormat pix_fmt = av_pix_fmt_desc_get_id(pix_desc); + enum AVPixelFormat av_unused pix_fmt = av_pix_fmt_desc_get_id(pix_desc); printf("%c%c%c%c%c %-16s %d %2d\n", sws_isSupportedInput (pix_fmt) ? 'I' : '.', sws_isSupportedOutput(pix_fmt) ? 'O' : '.', |