Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482'

* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482': lavfi: do not exclude hwaccel formats from ff_all_formats() Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · c36e85b3d9
parent 88dbdf4845 ae25413daf
commit c36e85b3d9
1 changed files with 1 additions and 2 deletions
--- a/libavfilter/formats.c
+++ b/libavfilter/formats.c
@ -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;