diff options
| author | Peter Ross <pross@xvid.org> | 2009-02-22 00:55:49 +0000 |
|---|---|---|
| committer | Peter Ross <pross@xvid.org> | 2009-02-22 00:55:49 +0000 |
| commit | 88c21a6f149e27ff860226043d6c31998152c883 (patch) | |
| tree | b98dc003aed1ce3b059e15e700c3da648e3081c2 /libavcodec | |
| parent | 0d8f0abfb94b4f6f6026a8c4867337438a675acf (diff) | |
| download | ffmpeg-88c21a6f149e27ff860226043d6c31998152c883.tar.gz | |
Add PIX_FMT_RGB48BE and PIX_FMT_RGB48LE.
Originally committed as revision 17510 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/imgconvert.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index abc253e96b..89438277e8 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -199,6 +199,22 @@ static const PixFmtInfo pix_fmt_info[PIX_FMT_NB] = { .depth = 8, .x_chroma_shift = 0, .y_chroma_shift = 0, }, + [PIX_FMT_RGB48BE] = { + .name = "rgb48be", + .nb_channels = 3, + .color_type = FF_COLOR_RGB, + .pixel_type = FF_PIXEL_PACKED, + .depth = 16, + .x_chroma_shift = 0, .y_chroma_shift = 0, + }, + [PIX_FMT_RGB48LE] = { + .name = "rgb48le", + .nb_channels = 3, + .color_type = FF_COLOR_RGB, + .pixel_type = FF_PIXEL_PACKED, + .depth = 16, + .x_chroma_shift = 0, .y_chroma_shift = 0, + }, [PIX_FMT_RGB565] = { .name = "rgb565", .nb_channels = 3, @@ -529,6 +545,10 @@ int ff_fill_linesize(AVPicture *picture, int pix_fmt, int width) case PIX_FMT_BGR32_1: picture->linesize[0] = width * 4; break; + case PIX_FMT_RGB48BE: + case PIX_FMT_RGB48LE: + picture->linesize[0] = width * 6; + break; case PIX_FMT_GRAY16BE: case PIX_FMT_GRAY16LE: case PIX_FMT_BGR555: @@ -616,6 +636,8 @@ int ff_fill_pointer(AVPicture *picture, uint8_t *ptr, int pix_fmt, case PIX_FMT_BGR32: case PIX_FMT_RGB32_1: case PIX_FMT_BGR32_1: + case PIX_FMT_RGB48BE: + case PIX_FMT_RGB48LE: case PIX_FMT_GRAY16BE: case PIX_FMT_GRAY16LE: case PIX_FMT_BGR555: |