diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:23:55 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-07 11:27:44 +0200 |
| commit | fe5b0895966382402e8fb17f63dfe8117c8915ec (patch) | |
| tree | 6e14fb542b5135950f54be551a5087e2795ec235 /libavfilter/vf_scale.c | |
| parent | dce12f694864454c5e5a987bd3fa808e66268af4 (diff) | |
| parent | 5f87c277bd5caa09cc4f9061d4ccdd58dc121110 (diff) | |
Merge commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110'
* commit '5f87c277bd5caa09cc4f9061d4ccdd58dc121110':
vf_scale: add endianness conversion pixel format in query_formats
Conflicts:
libavfilter/vf_scale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_scale.c')
| -rw-r--r-- | libavfilter/vf_scale.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index cce2cc220b..4343611a5d 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -159,7 +159,8 @@ static int query_formats(AVFilterContext *ctx) if (ctx->inputs[0]) { formats = NULL; for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) - if ( sws_isSupportedInput(pix_fmt) + if ((sws_isSupportedInput(pix_fmt) || + sws_isSupportedEndiannessConversion(pix_fmt)) && (ret = ff_add_format(&formats, pix_fmt)) < 0) { ff_formats_unref(&formats); return ret; @@ -169,7 +170,8 @@ static int query_formats(AVFilterContext *ctx) if (ctx->outputs[0]) { formats = NULL; for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++) - if ( (sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8) + if ((sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8 || + sws_isSupportedEndiannessConversion(pix_fmt)) && (ret = ff_add_format(&formats, pix_fmt)) < 0) { ff_formats_unref(&formats); return ret; |