summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-09 23:04:03 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-09 23:04:03 +0000
commit43451ec247b6e43116d0b324eb5f8eba43d79135 (patch)
tree061714680541f663314b0018687a717ff1c9f2a0
parent934edecdb88626a679d1cfc16fc094dc87f7c589 (diff)
downloadffmpeg-43451ec247b6e43116d0b324eb5f8eba43d79135.tar.gz
Add missing nut-specific codec tags for rawvideo pixel formats.
Add codec tags for the formats: [15]BGR Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian [NOT in AVI] [15]RGB Packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian [NOT in AVI] [16]BGR Packed RGB 5:6:5, 16bpp, (msb) 5R 6G 5B(lsb), big-endian [NOT in AVI] [16]RGB Packed BGR 5:6:5, 16bpp, (msb) 5B 6G 5R(lsb), big-endian [NOT in AVI] RGBA Packed RGBA 8:8:8:8, 32bpp, RGBA [NOT in AVI] BGRA Packed RGBA 8:8:8:8, 32bpp, BGRA [NOT in AVI] ABGR Packed RGBA 8:8:8:8, 32bpp, ABGR [NOT in AVI] ARGB Packed RGBA 8:8:8:8, 32bpp, ARGB [NOT in AVI] RGB[24] Packed RGB 8:8:8, 24bpp RGB [NOT in AVI] BGR[24] Packed RGB 8:8:8, 24bpp BGR [NOT in AVI] which are listed in the nut4cc.txt spec. Originally committed as revision 23074 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/raw.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index bd386c2023..107414210d 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -69,6 +69,16 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
{ PIX_FMT_RGB565LE, MKTAG('R', 'G', 'B', 16) },
{ PIX_FMT_BGR565LE, MKTAG('B', 'G', 'R', 16) },
{ PIX_FMT_RGB565LE, MKTAG( 3 , 0 , 0 , 0) },
+ { PIX_FMT_RGB555BE, MKTAG(15 , 'B', 'G', 'R') },
+ { PIX_FMT_BGR555BE, MKTAG(15 , 'R', 'G', 'B') },
+ { PIX_FMT_RGB565BE, MKTAG(16 , 'B', 'G', 'R') },
+ { PIX_FMT_BGR565BE, MKTAG(16 , 'R', 'G', 'B') },
+ { PIX_FMT_RGBA, MKTAG('R', 'G', 'B', 'A') },
+ { PIX_FMT_BGRA, MKTAG('B', 'G', 'R', 'A') },
+ { PIX_FMT_ABGR, MKTAG('A', 'B', 'G', 'R') },
+ { PIX_FMT_ARGB, MKTAG('A', 'R', 'G', 'B') },
+ { PIX_FMT_RGB24, MKTAG('R', 'G', 'B', 24 ) },
+ { PIX_FMT_BGR24, MKTAG('B', 'G', 'R', 24 ) },
/* quicktime */
{ PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },