diff options
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 92b4b8007d..b8e80475b4 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -136,12 +136,12 @@ unsigned swscale_version(void) || (x)==PIX_FMT_YUV440P \ || (x)==PIX_FMT_MONOWHITE \ || (x)==PIX_FMT_MONOBLACK \ - || (x)==PIX_FMT_YUV420PLE \ - || (x)==PIX_FMT_YUV422PLE \ - || (x)==PIX_FMT_YUV444PLE \ - || (x)==PIX_FMT_YUV420PBE \ - || (x)==PIX_FMT_YUV422PBE \ - || (x)==PIX_FMT_YUV444PBE \ + || (x)==PIX_FMT_YUV420P16LE \ + || (x)==PIX_FMT_YUV422P16LE \ + || (x)==PIX_FMT_YUV444P16LE \ + || (x)==PIX_FMT_YUV420P16BE \ + || (x)==PIX_FMT_YUV422P16BE \ + || (x)==PIX_FMT_YUV444P16BE \ ) #define isSupportedOut(x) ( \ (x)==PIX_FMT_YUV420P \ @@ -160,12 +160,12 @@ unsigned swscale_version(void) || (x)==PIX_FMT_GRAY8 \ || (x)==PIX_FMT_YUV410P \ || (x)==PIX_FMT_YUV440P \ - || (x)==PIX_FMT_YUV420PLE \ - || (x)==PIX_FMT_YUV422PLE \ - || (x)==PIX_FMT_YUV444PLE \ - || (x)==PIX_FMT_YUV420PBE \ - || (x)==PIX_FMT_YUV422PBE \ - || (x)==PIX_FMT_YUV444PBE \ + || (x)==PIX_FMT_YUV420P16LE \ + || (x)==PIX_FMT_YUV422P16LE \ + || (x)==PIX_FMT_YUV444P16LE \ + || (x)==PIX_FMT_YUV420P16BE \ + || (x)==PIX_FMT_YUV422P16BE \ + || (x)==PIX_FMT_YUV444P16BE \ ) #define isPacked(x) ( \ (x)==PIX_FMT_PAL8 \ @@ -459,18 +459,18 @@ const char *sws_format_name(enum PixelFormat format) return "vdpau_wmv3"; case PIX_FMT_VDPAU_VC1: return "vdpau_vc1"; - case PIX_FMT_YUV420PLE: - return "yuv420ple"; - case PIX_FMT_YUV422PLE: - return "yuv422ple"; - case PIX_FMT_YUV444PLE: - return "yuv444ple"; - case PIX_FMT_YUV420PBE: - return "yuv420pbe"; - case PIX_FMT_YUV422PBE: - return "yuv422pbe"; - case PIX_FMT_YUV444PBE: - return "yuv444pbe"; + case PIX_FMT_YUV420P16LE: + return "yuv420p16le"; + case PIX_FMT_YUV422P16LE: + return "yuv422p16le"; + case PIX_FMT_YUV444P16LE: + return "yuv444p16le"; + case PIX_FMT_YUV420P16BE: + return "yuv420p16be"; + case PIX_FMT_YUV422P16BE: + return "yuv422p16be"; + case PIX_FMT_YUV444P16BE: + return "yuv444p16be"; default: return "Unknown format"; } @@ -2371,8 +2371,8 @@ static void getSubSampleFactors(int *h, int *v, int format) *v=0; break; case PIX_FMT_YUV420P: - case PIX_FMT_YUV420PLE: - case PIX_FMT_YUV420PBE: + case PIX_FMT_YUV420P16LE: + case PIX_FMT_YUV420P16BE: case PIX_FMT_YUVA420P: case PIX_FMT_GRAY16BE: case PIX_FMT_GRAY16LE: @@ -2391,14 +2391,14 @@ static void getSubSampleFactors(int *h, int *v, int format) *v=2; break; case PIX_FMT_YUV444P: - case PIX_FMT_YUV444PLE: - case PIX_FMT_YUV444PBE: + case PIX_FMT_YUV444P16LE: + case PIX_FMT_YUV444P16BE: *h=0; *v=0; break; case PIX_FMT_YUV422P: - case PIX_FMT_YUV422PLE: - case PIX_FMT_YUV422PBE: + case PIX_FMT_YUV422P16LE: + case PIX_FMT_YUV422P16BE: *h=1; *v=0; break; |