1. ffmpeg
  2. Commit fe5b0895966382402e8fb17f63dfe8117c8915ec
Browse code

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>

Michael Niedermayer authored on 2013/05/07 18:23:55
Showing 8 changed files
libavfilter/vf_scale.c
History View file @ fe5b089
... ... 
@@ -159,7 +159,8 @@ static int query_formats(AVFilterContext *ctx)
159 159 
     if (ctx->inputs[0]) {
160 160 
         formats = NULL;
161 161 
         for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
162 
-            if (   sws_isSupportedInput(pix_fmt)
162 
+            if ((sws_isSupportedInput(pix_fmt) ||
163 
+                 sws_isSupportedEndiannessConversion(pix_fmt))
163 164 
                 && (ret = ff_add_format(&formats, pix_fmt)) < 0) {
164 165 
                 ff_formats_unref(&formats);
165 166 
                 return ret;
... ... 
@@ -169,7 +170,8 @@ static int query_formats(AVFilterContext *ctx)
169 169 
     if (ctx->outputs[0]) {
170 170 
         formats = NULL;
171 171 
         for (pix_fmt = 0; pix_fmt < AV_PIX_FMT_NB; pix_fmt++)
172 
-            if (   (sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8)
172 
+            if ((sws_isSupportedOutput(pix_fmt) || pix_fmt == AV_PIX_FMT_PAL8 ||
173 
+                 sws_isSupportedEndiannessConversion(pix_fmt))
173 174 
                 && (ret = ff_add_format(&formats, pix_fmt)) < 0) {
174 175 
                 ff_formats_unref(&formats);
175 176 
                 return ret;
tests/ref/fate/filter-pixfmts-copy
History View file @ fe5b089
... ... 
@@ -46,6 +46,8 @@ rgb565le            20757fafe4756e62d845b2ab4c0b8f93
46 46 
 rgb8                e01614f5416dcc8ad365ad7a57afc9fb
47 47 
 rgba                53796fa4c392a1b2659595b6a284f8c4
48 48 
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
49 
+xyz12be             e1e6718ae1c83e904fbdf903d62e5808
50 
+xyz12le             24e8a22c1bd7d637edb731d10b7c54d0
49 51 
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
50 52 
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
51 53 
 yuv420p             61fffd2d8425759a33ae07e718d0242d
tests/ref/fate/filter-pixfmts-field
History View file @ fe5b089
... ... 
@@ -46,6 +46,8 @@ rgb565le            53bbd558fb0dcd82f1fad83ea855c3ad
46 46 
 rgb8                67bfdd4fa88b1ab9be876f42dfc75683
47 47 
 rgba                d0ebdf1495bc6b7e9d3bfbe2813a9d16
48 48 
 uyvy422             a6a52504a16f09b8f2ec2405bc8190b5
49 
+xyz12be             9d904fb640dd024e668acb9dc7b3f11f
50 
+xyz12le             7f93c7d2981f1976108e941afa1363f8
49 51 
 yuv410p             3feb55b1e2a385b488c82e808a12587b
50 52 
 yuv411p             ab3dd8e6cf1452afe2d2e976e4726370
51 53 
 yuv420p             52e26ad198368e2326bef97cdfa6a2bb
tests/ref/fate/filter-pixfmts-hflip
History View file @ fe5b089
... ... 
@@ -43,6 +43,8 @@ rgb565be            6727e71974c8e5dad157925c10ee1532
43 43 
 rgb565le            b0a2b4817775289cfc415bb951f9ae0c
44 44 
 rgb8                22fdbd14ce296c1afa9bb4a6ea09b3fe
45 45 
 rgba                a37789c4df73c3bd8648ad1fe9d3f991
46 
+xyz12be             4738d2cb5321376d5eed70930f47a953
47 
+xyz12le             51288f3440c8584406b332545d69c5a9
46 48 
 yuv410p             a1280c2b9b562dba3c2d35a1e5fc4b23
47 49 
 yuv411p             6bf10756ac5c7841db63a97106ff911b
48 50 
 yuv420p             45f4a06481f2cd8e28fb29c7c151e110
tests/ref/fate/filter-pixfmts-il
History View file @ fe5b089
... ... 
@@ -45,6 +45,8 @@ rgb565le            a97549f25e63dd0dd404db41bbe05c07
45 45 
 rgb8                a35d3c3b9b87261c7417076a8b18fdb8
46 46 
 rgba                8ca9c8db589615ebbaa964be4ce62d08
47 47 
 uyvy422             8be40aded4b407ff66305911ba5ce2ce
48 
+xyz12be             1cbb1f72c6875934e66f50f499a62cc3
49 
+xyz12le             ba8c6eab49e58eace392ef0aeedbf677
48 50 
 yuv410p             92112d85ba4f74cbd3044945c0f33402
49 51 
 yuv411p             b6b22000e5275c92baf5afc417c32a70
50 52 
 yuv420p             fca7fbbff753612a718ee13e1dfe2af2
tests/ref/fate/filter-pixfmts-null
History View file @ fe5b089
... ... 
@@ -46,6 +46,8 @@ rgb565le            20757fafe4756e62d845b2ab4c0b8f93
46 46 
 rgb8                e01614f5416dcc8ad365ad7a57afc9fb
47 47 
 rgba                53796fa4c392a1b2659595b6a284f8c4
48 48 
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
49 
+xyz12be             e1e6718ae1c83e904fbdf903d62e5808
50 
+xyz12le             24e8a22c1bd7d637edb731d10b7c54d0
49 51 
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
50 52 
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
51 53 
 yuv420p             61fffd2d8425759a33ae07e718d0242d
tests/ref/fate/filter-pixfmts-scale
History View file @ fe5b089
... ... 
@@ -46,6 +46,8 @@ rgb565le            301a4d41f0db3aaed341d812ed0d7927
46 46 
 rgb8                8e5786e83099bc89d2e38a76e6dfcc52
47 47 
 rgba                de6a65b8c01bdad84e575202ca8b66a0
48 48 
 uyvy422             479105bc4c7fbb4a33ca8745aa8c2de8
49 
+xyz12be             e9be06091b6dd0b67598eaf8bd86a78e
50 
+xyz12le             05a9bbd16d81183ef3db04447648e3b1
49 51 
 yuv410p             d0daa93f5cee83360e219e39563ab6da
50 52 
 yuv411p             e5c8f3ca024a88dd07e0a92db3e2133d
51 53 
 yuv420p             485d9af8608f926ffffbf42230b4150d
tests/ref/fate/filter-pixfmts-vflip
History View file @ fe5b089
... ... 
@@ -46,6 +46,8 @@ rgb565le            991576c5d3308a73068a826543b3e7af
46 46 
 rgb8                42230235c5a2a66c0f9a2fcd20f9f5cd
47 47 
 rgba                a6973a2940a378d2a8284194da26eec0
48 48 
 uyvy422             21c48162379321bb83ec2399535f9253
49 
+xyz12be             7070af64e30fa689e3627b1dde7506f4
50 
+xyz12le             4c4b31100b836638e7e61181997c49e1
49 51 
 yuv410p             8699f50c04f8ac931aa5a8306827364b
50 52 
 yuv411p             47af34559b92b68851df4c2b170f7736
51 53 
 yuv420p             c59b35b82b5a195128736021913b35a4