Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'ae25413daf'

Browse source 
* commit 'ae25413daf':
  lavfi: do not exclude hwaccel formats from ff_all_formats()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-29 13:48:58 +02:00
commit c36e85b3d9
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavfilter/formats.c
View file

@ -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;