mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '908f737d6c2900b5d34319ca6ea1d1cb71221463'
* commit '908f737d6c2900b5d34319ca6ea1d1cb71221463': cmdutils: Mark conditionally used variable as av_unused Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
26868f80e0
|
@ -38,6 +38,7 @@
|
||||||
#include "libswscale/swscale.h"
|
#include "libswscale/swscale.h"
|
||||||
#include "libswresample/swresample.h"
|
#include "libswresample/swresample.h"
|
||||||
#include "libpostproc/postprocess.h"
|
#include "libpostproc/postprocess.h"
|
||||||
|
#include "libavutil/attributes.h"
|
||||||
#include "libavutil/avassert.h"
|
#include "libavutil/avassert.h"
|
||||||
#include "libavutil/avstring.h"
|
#include "libavutil/avstring.h"
|
||||||
#include "libavutil/bprint.h"
|
#include "libavutil/bprint.h"
|
||||||
|
@ -1702,7 +1703,7 @@ int show_pix_fmts(void *optctx, const char *opt, const char *arg)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
while ((pix_desc = av_pix_fmt_desc_next(pix_desc))) {
|
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",
|
printf("%c%c%c%c%c %-16s %d %2d\n",
|
||||||
sws_isSupportedInput (pix_fmt) ? 'I' : '.',
|
sws_isSupportedInput (pix_fmt) ? 'I' : '.',
|
||||||
sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
|
sws_isSupportedOutput(pix_fmt) ? 'O' : '.',
|
||||||
|
|
Loading…
Reference in New Issue