comparison raw.c @ 4494:ce643a22f049 libavcodec

Replace deprecated PIX_FMT names by the newer variants.
author diego
date Wed, 07 Feb 2007 01:48:09 +0000
parents f97a2081b5b1
children 96d4d0710099
comparison
equal deleted inserted replaced
4493:e78c415815f3 4494:ce643a22f049
46 { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') }, 46 { PIX_FMT_YUV422P, MKTAG('Y', '4', '2', 'B') },
47 { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') }, 47 { PIX_FMT_GRAY8, MKTAG('Y', '8', '0', '0') },
48 { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, 48 { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') },
49 49
50 50
51 { PIX_FMT_YUV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */ 51 { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */
52 { PIX_FMT_YUV422, MKTAG('Y', '4', '2', '2') }, 52 { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') },
53 { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') }, 53 { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') },
54 { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, 54 { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
55 { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) }, 55 { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) },
56 { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) }, 56 { PIX_FMT_BGR555, MKTAG('B', 'G', 'R', 15) },
57 { PIX_FMT_RGB565, MKTAG('R', 'G', 'B', 16) }, 57 { PIX_FMT_RGB565, MKTAG('R', 'G', 'B', 16) },
97 switch(avctx->bits_per_sample){ 97 switch(avctx->bits_per_sample){
98 case 8: avctx->pix_fmt= PIX_FMT_PAL8 ; break; 98 case 8: avctx->pix_fmt= PIX_FMT_PAL8 ; break;
99 case 15: avctx->pix_fmt= PIX_FMT_RGB555; break; 99 case 15: avctx->pix_fmt= PIX_FMT_RGB555; break;
100 case 16: avctx->pix_fmt= PIX_FMT_RGB555; break; 100 case 16: avctx->pix_fmt= PIX_FMT_RGB555; break;
101 case 24: avctx->pix_fmt= PIX_FMT_BGR24 ; break; 101 case 24: avctx->pix_fmt= PIX_FMT_BGR24 ; break;
102 case 32: avctx->pix_fmt= PIX_FMT_RGBA32; break; 102 case 32: avctx->pix_fmt= PIX_FMT_RGB32; break;
103 } 103 }
104 } 104 }
105 105
106 context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); 106 context->length = avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height);
107 context->buffer = av_malloc(context->length); 107 context->buffer = av_malloc(context->length);