diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:04:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 17:04:58 +0200 |
commit | 13afee951a49964abb6d3e2d11644ac9d5ded2c7 (patch) | |
tree | ba98a70ac6f80dea08f21badfbbb64319541d826 /libavfilter/formats.c | |
parent | af7dd79a323090b14a7fb9ef24a3f6a24dc6d2db (diff) | |
parent | 59ee9f78b0cc4fb84ae606fa317d8102ad32a627 (diff) |
Merge commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627'
* commit '59ee9f78b0cc4fb84ae606fa317d8102ad32a627':
lavfi: do not use av_pix_fmt_descriptors directly.
Conflicts:
libavfilter/buffersrc.c
libavfilter/drawutils.c
libavfilter/filtfmts.c
libavfilter/vf_ass.c
libavfilter/vf_boxblur.c
libavfilter/vf_drawtext.c
libavfilter/vf_lut.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/formats.c')
-rw-r--r-- | libavfilter/formats.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index c90fb35d6f..c8c2257bb7 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -268,10 +268,12 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type) int num_formats = type == AVMEDIA_TYPE_VIDEO ? AV_PIX_FMT_NB : type == AVMEDIA_TYPE_AUDIO ? AV_SAMPLE_FMT_NB : 0; - for (fmt = 0; fmt < num_formats; fmt++) + for (fmt = 0; fmt < num_formats; fmt++) { + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); if ((type != AVMEDIA_TYPE_VIDEO) || - (type == AVMEDIA_TYPE_VIDEO && !(av_pix_fmt_descriptors[fmt].flags & PIX_FMT_HWACCEL))) + (type == AVMEDIA_TYPE_VIDEO && !(desc->flags & PIX_FMT_HWACCEL))) ff_add_format(&ret, fmt); + } return ret; } |