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; diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy index 68ec82837a..4d4088fe32 100644 --- a/tests/ref/fate/filter-pixfmts-copy +++ b/tests/ref/fate/filter-pixfmts-copy @@ -46,6 +46,8 @@ rgb565le 20757fafe4756e62d845b2ab4c0b8f93 rgb8 e01614f5416dcc8ad365ad7a57afc9fb rgba 53796fa4c392a1b2659595b6a284f8c4 uyvy422 3f411f947e3ac8f842c88e717d68bd9a +xyz12be e1e6718ae1c83e904fbdf903d62e5808 +xyz12le 24e8a22c1bd7d637edb731d10b7c54d0 yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db yuv411p 9461b188dab6f8b90d9a27e353a89f58 yuv420p 61fffd2d8425759a33ae07e718d0242d diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field index 68a4643ea2..eef2eba12d 100644 --- a/tests/ref/fate/filter-pixfmts-field +++ b/tests/ref/fate/filter-pixfmts-field @@ -46,6 +46,8 @@ rgb565le 53bbd558fb0dcd82f1fad83ea855c3ad rgb8 67bfdd4fa88b1ab9be876f42dfc75683 rgba d0ebdf1495bc6b7e9d3bfbe2813a9d16 uyvy422 a6a52504a16f09b8f2ec2405bc8190b5 +xyz12be 9d904fb640dd024e668acb9dc7b3f11f +xyz12le 7f93c7d2981f1976108e941afa1363f8 yuv410p 3feb55b1e2a385b488c82e808a12587b yuv411p ab3dd8e6cf1452afe2d2e976e4726370 yuv420p 52e26ad198368e2326bef97cdfa6a2bb diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip index ee5c2d36ab..a6f5d83826 100644 --- a/tests/ref/fate/filter-pixfmts-hflip +++ b/tests/ref/fate/filter-pixfmts-hflip @@ -43,6 +43,8 @@ rgb565be 6727e71974c8e5dad157925c10ee1532 rgb565le b0a2b4817775289cfc415bb951f9ae0c rgb8 22fdbd14ce296c1afa9bb4a6ea09b3fe rgba a37789c4df73c3bd8648ad1fe9d3f991 +xyz12be 4738d2cb5321376d5eed70930f47a953 +xyz12le 51288f3440c8584406b332545d69c5a9 yuv410p a1280c2b9b562dba3c2d35a1e5fc4b23 yuv411p 6bf10756ac5c7841db63a97106ff911b yuv420p 45f4a06481f2cd8e28fb29c7c151e110 diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il index d4a8142630..29e4235000 100644 --- a/tests/ref/fate/filter-pixfmts-il +++ b/tests/ref/fate/filter-pixfmts-il @@ -45,6 +45,8 @@ rgb565le a97549f25e63dd0dd404db41bbe05c07 rgb8 a35d3c3b9b87261c7417076a8b18fdb8 rgba 8ca9c8db589615ebbaa964be4ce62d08 uyvy422 8be40aded4b407ff66305911ba5ce2ce +xyz12be 1cbb1f72c6875934e66f50f499a62cc3 +xyz12le ba8c6eab49e58eace392ef0aeedbf677 yuv410p 92112d85ba4f74cbd3044945c0f33402 yuv411p b6b22000e5275c92baf5afc417c32a70 yuv420p fca7fbbff753612a718ee13e1dfe2af2 diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null index 68ec82837a..4d4088fe32 100644 --- a/tests/ref/fate/filter-pixfmts-null +++ b/tests/ref/fate/filter-pixfmts-null @@ -46,6 +46,8 @@ rgb565le 20757fafe4756e62d845b2ab4c0b8f93 rgb8 e01614f5416dcc8ad365ad7a57afc9fb rgba 53796fa4c392a1b2659595b6a284f8c4 uyvy422 3f411f947e3ac8f842c88e717d68bd9a +xyz12be e1e6718ae1c83e904fbdf903d62e5808 +xyz12le 24e8a22c1bd7d637edb731d10b7c54d0 yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db yuv411p 9461b188dab6f8b90d9a27e353a89f58 yuv420p 61fffd2d8425759a33ae07e718d0242d diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale index 9bc3ced29a..375ad7cc11 100644 --- a/tests/ref/fate/filter-pixfmts-scale +++ b/tests/ref/fate/filter-pixfmts-scale @@ -46,6 +46,8 @@ rgb565le 301a4d41f0db3aaed341d812ed0d7927 rgb8 8e5786e83099bc89d2e38a76e6dfcc52 rgba de6a65b8c01bdad84e575202ca8b66a0 uyvy422 479105bc4c7fbb4a33ca8745aa8c2de8 +xyz12be e9be06091b6dd0b67598eaf8bd86a78e +xyz12le 05a9bbd16d81183ef3db04447648e3b1 yuv410p d0daa93f5cee83360e219e39563ab6da yuv411p e5c8f3ca024a88dd07e0a92db3e2133d yuv420p 485d9af8608f926ffffbf42230b4150d diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip index 7990c3ec34..c6a6c0642c 100644 --- a/tests/ref/fate/filter-pixfmts-vflip +++ b/tests/ref/fate/filter-pixfmts-vflip @@ -46,6 +46,8 @@ rgb565le 991576c5d3308a73068a826543b3e7af rgb8 42230235c5a2a66c0f9a2fcd20f9f5cd rgba a6973a2940a378d2a8284194da26eec0 uyvy422 21c48162379321bb83ec2399535f9253 +xyz12be 7070af64e30fa689e3627b1dde7506f4 +xyz12le 4c4b31100b836638e7e61181997c49e1 yuv410p 8699f50c04f8ac931aa5a8306827364b yuv411p 47af34559b92b68851df4c2b170f7736 yuv420p c59b35b82b5a195128736021913b35a4