diff options
author | Diego Biurrun <diego@biurrun.de> | 2007-02-07 01:48:09 +0000 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2007-02-07 01:48:09 +0000 |
commit | 71e445fca3ccc1285068386bf9858d180b0fecfc (patch) | |
tree | 230f6ba62bf0a9af096cad7c2a7c332b066e2965 /libavcodec/raw.c | |
parent | 917fa192c72e226ffaddefbe6661ec3c405156cf (diff) | |
download | ffmpeg-71e445fca3ccc1285068386bf9858d180b0fecfc.tar.gz |
Replace deprecated PIX_FMT names by the newer variants.
Originally committed as revision 7867 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/raw.c')
-rw-r--r-- | libavcodec/raw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c index f4fddf73cc..f494f8a1c9 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -48,8 +48,8 @@ static const PixelFormatTag pixelFormatTags[] = { { PIX_FMT_GRAY8, MKTAG(' ', ' ', 'Y', '8') }, - { PIX_FMT_YUV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */ - { PIX_FMT_YUV422, MKTAG('Y', '4', '2', '2') }, + { PIX_FMT_YUYV422, MKTAG('Y', 'U', 'Y', '2') }, /* Packed formats */ + { PIX_FMT_YUYV422, MKTAG('Y', '4', '2', '2') }, { PIX_FMT_UYVY422, MKTAG('U', 'Y', 'V', 'Y') }, { PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') }, { PIX_FMT_RGB555, MKTAG('R', 'G', 'B', 15) }, @@ -99,7 +99,7 @@ static int raw_init_decoder(AVCodecContext *avctx) case 15: avctx->pix_fmt= PIX_FMT_RGB555; break; case 16: avctx->pix_fmt= PIX_FMT_RGB555; break; case 24: avctx->pix_fmt= PIX_FMT_BGR24 ; break; - case 32: avctx->pix_fmt= PIX_FMT_RGBA32; break; + case 32: avctx->pix_fmt= PIX_FMT_RGB32; break; } } |