1. ffmpeg
  2. Commit c36e85b3d9a13a223a621e7c322ce5903080cc4b
Browse code

Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482'

* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
lavfi: do not exclude hwaccel formats from ff_all_formats()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Hendrik Leppkes authored on 2015/09/29 20:48:58
Showing 1 changed files
libavfilter/formats.c
History View file @ c36e85b
... ... 
@@ -340,8 +340,7 @@ AVFilterFormats *ff_all_formats(enum AVMediaType type)
340 340 
     if (type == AVMEDIA_TYPE_VIDEO) {
341 341 
         const AVPixFmtDescriptor *desc = NULL;
342 342 
         while ((desc = av_pix_fmt_desc_next(desc))) {
343 
-            if (!(desc->flags & AV_PIX_FMT_FLAG_HWACCEL))
344 
-                ff_add_format(&ret, av_pix_fmt_desc_get_id(desc));
343 
+            ff_add_format(&ret, av_pix_fmt_desc_get_id(desc));
345 344 
         }
346 345 
     } else if (type == AVMEDIA_TYPE_AUDIO) {
347 346 
         enum AVSampleFormat fmt = 0;