diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:48:58 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 13:48:58 +0200 |
| commit | c36e85b3d9a13a223a621e7c322ce5903080cc4b (patch) | |
| tree | 58d4a45e57f46e351605043a2f49c89d7f17be6f /libavfilter | |
| parent | 88dbdf4845e31ef2a812b11e33aee823319fa442 (diff) | |
| parent | ae25413daf42a06f078ed81bb545ec23a8e0b482 (diff) | |
Merge commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482'
* commit 'ae25413daf42a06f078ed81bb545ec23a8e0b482':
lavfi: do not exclude hwaccel formats from ff_all_formats()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/formats.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 8758b3d113..a28be60a65 100644 --- 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; |