Commit c36e85b3 authored by Hendrik Leppkes's avatar Hendrik Leppkes

Merge commit 'ae25413d'

* commit 'ae25413d':
  lavfi: do not exclude hwaccel formats from ff_all_formats()
Merged-by: 's avatarHendrik Leppkes <h.leppkes@gmail.com>
parents 88dbdf48 ae25413d
......@@ -340,8 +340,7 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type)
if (type == AVMEDIA_TYPE_VIDEO) {
const AVPixFmtDescriptor *desc = NULL;
while ((desc = av_pix_fmt_desc_next(desc))) {
if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL))
ff_add_format(&ret, av_pix_fmt_desc_get_id(desc));
ff_add_format(&ret, av_pix_fmt_desc_get_id(desc));
}
} else if (type == AVMEDIA_TYPE_AUDIO) {
enum AVSampleFormat fmt = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment