summaryrefslogtreecommitdiff
path: root/libswscale/swscale_template.c
diff options
context:
space:
mode:
authorLars Täuber <lars.taeuber@gmx.net>2009-09-05 23:33:11 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-09-05 23:33:11 +0000
commit991e579cae838bc5a10ef6346b5b5f2abd0b01cb (patch)
tree525b12dea624c6bc01b5c06f2d4c8f53d86ace59 /libswscale/swscale_template.c
parent5333450ce6b2cbe7e45b3e7520656e954dda6e75 (diff)
Make 16bit YUV formats compatible with NE avcodec_get_pix_fmt().
Patch by Lars Täuber <lars <dot> taeuber <at> gmx <dot> net>. Originally committed as revision 29650 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale_template.c')
-rw-r--r--libswscale/swscale_template.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/libswscale/swscale_template.c b/libswscale/swscale_template.c
index c985dfb3ea..48eda805cc 100644
--- a/libswscale/swscale_template.c
+++ b/libswscale/swscale_template.c
@@ -2914,12 +2914,12 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
case PIX_FMT_PAL8 :
case PIX_FMT_BGR4_BYTE:
case PIX_FMT_RGB4_BYTE: c->hcscale_internal = palToUV; break;
- case PIX_FMT_YUV420PBE:
- case PIX_FMT_YUV422PBE:
- case PIX_FMT_YUV444PBE: c->hcscale_internal = RENAME(BEToUV); break;
- case PIX_FMT_YUV420PLE:
- case PIX_FMT_YUV422PLE:
- case PIX_FMT_YUV444PLE: c->hcscale_internal = RENAME(LEToUV); break;
+ case PIX_FMT_YUV420P16BE:
+ case PIX_FMT_YUV422P16BE:
+ case PIX_FMT_YUV444P16BE: c->hcscale_internal = RENAME(BEToUV); break;
+ case PIX_FMT_YUV420P16LE:
+ case PIX_FMT_YUV422P16LE:
+ case PIX_FMT_YUV444P16LE: c->hcscale_internal = RENAME(LEToUV); break;
}
if (c->chrSrcHSubSample) {
switch(srcFormat) {
@@ -2957,14 +2957,14 @@ static void RENAME(sws_init_swScale)(SwsContext *c)
c->hascale_internal = NULL;
switch (srcFormat) {
case PIX_FMT_YUYV422 :
- case PIX_FMT_YUV420PBE:
- case PIX_FMT_YUV422PBE:
- case PIX_FMT_YUV444PBE:
+ case PIX_FMT_YUV420P16BE:
+ case PIX_FMT_YUV422P16BE:
+ case PIX_FMT_YUV444P16BE:
case PIX_FMT_GRAY16BE : c->hyscale_internal = RENAME(yuy2ToY); break;
case PIX_FMT_UYVY422 :
- case PIX_FMT_YUV420PLE:
- case PIX_FMT_YUV422PLE:
- case PIX_FMT_YUV444PLE:
+ case PIX_FMT_YUV420P16LE:
+ case PIX_FMT_YUV422P16LE:
+ case PIX_FMT_YUV444P16LE:
case PIX_FMT_GRAY16LE : c->hyscale_internal = RENAME(uyvyToY); break;
case PIX_FMT_BGR24 : c->hyscale_internal = RENAME(bgr24ToY); break;
case PIX_FMT_BGR565 : c->hyscale_internal = bgr16ToY; break;