[FFmpeg-cvslog] r23342 - in trunk: libavcodec/raw.c libavformat/nut.c

[stefano]

Author: stefano
Date: Thu May 27 00:26:19 2010
New Revision: 23342

Log:
Add support for the newly added Nut codec tags (added in Nut r669):
Y1[00][16], [16][00]1Y, Y3[11][16], [16][11]3Y, Y3[10][16],
[16][10]3Y, Y3[00][16], [16][00]3Y, Y4[11][ 8], Y2[00][ 8].

Modified:
   trunk/libavcodec/raw.c
   trunk/libavformat/nut.c

Modified: trunk/libavcodec/raw.c
==============================================================================
--- trunk/libavcodec/raw.c	Wed May 26 22:22:29 2010	(r23341)
+++ trunk/libavcodec/raw.c	Thu May 27 00:26:19 2010	(r23342)
@@ -97,6 +97,16 @@ const PixelFormatTag ff_raw_pix_fmt_tags
     { PIX_FMT_RGB4,     MKTAG('R', 'G', 'B',  4 ) },
     { PIX_FMT_RGB48LE,  MKTAG('R', 'G', 'B', 48 ) },
     { PIX_FMT_RGB48BE,  MKTAG( 48, 'R', 'G', 'B') },
+    { PIX_FMT_GRAY16LE,    MKTAG('Y', '1',  0 , 16 ) },
+    { PIX_FMT_GRAY16BE,    MKTAG(16 ,  0 , '1', 'Y') },
+    { PIX_FMT_YUV420P16LE, MKTAG('Y', '3', 11 , 16 ) },
+    { PIX_FMT_YUV420P16BE, MKTAG(16 , 11 , '3', 'Y') },
+    { PIX_FMT_YUV422P16LE, MKTAG('Y', '3', 10 , 16 ) },
+    { PIX_FMT_YUV422P16BE, MKTAG(16 , 10 , '3', 'Y') },
+    { PIX_FMT_YUV444P16LE, MKTAG('Y', '3',  0 , 16 ) },
+    { PIX_FMT_YUV444P16BE, MKTAG(16 ,  0 , '3', 'Y') },
+    { PIX_FMT_YUVA420P,    MKTAG('Y', '4', 11 ,  8 ) },
+    { PIX_FMT_Y400A,       MKTAG('Y', '2',  0 ,  8 ) },
 
     /* quicktime */
     { PIX_FMT_UYVY422, MKTAG('2', 'v', 'u', 'y') },

Modified: trunk/libavformat/nut.c
==============================================================================
--- trunk/libavformat/nut.c	Wed May 26 22:22:29 2010	(r23341)
+++ trunk/libavformat/nut.c	Thu May 27 00:26:19 2010	(r23342)
@@ -61,6 +61,16 @@ const AVCodecTag ff_nut_video_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B',  4 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
     { CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '1',  0 , 16 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(16 ,  0 , '1', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(16 , 11 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 16 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(16 , 10 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3',  0 , 16 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(16 ,  0 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11 ,  8 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '2',  0 ,  8 ) },
     { CODEC_ID_NONE    , 0                         }
 };