generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3'

Browse Source 
* commit 'a7d070acb55c3ebbdd5e93e3366f32865732b8a3':
  vf_fieldorder: avoid using AV_PIX_FMT_NB

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-05-27 03:02:09 +02:00
commit cdf6a9441d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/vf_fieldorder.c
View File

@ -47,9 +47,10 @@ static int query_formats(AVFilterContext *ctx)
/** accept any input pixel format that is not hardware accelerated, not /** accept any input pixel format that is not hardware accelerated, not
* a bitstream format, and does not have vertically sub-sampled chroma */ * a bitstream format, and does not have vertically sub-sampled chroma */
if (ctx->inputs[0]) { if (ctx->inputs[0]) {
const AVPixFmtDescriptor *desc = NULL;
formats = NULL; formats = NULL;
for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) { while ((desc = av_pix_fmt_desc_next(desc))) {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); pix_fmt = av_pix_fmt_desc_get_id(desc);
if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL || if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL ||
desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PAL ||
desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) && desc->flags & AV_PIX_FMT_FLAG_BITSTREAM) &&