From ab8f6009026b9d2e9ee72ee3524c34356bbb1523 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Wed, 26 May 2010 22:26:19 +0000 Subject: [PATCH] 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]. Originally committed as revision 23342 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/raw.c | 10 ++++++++++ libavformat/nut.c | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/libavcodec/raw.c b/libavcodec/raw.c index be9bdea8d1..8d63f56fa9 100644 --- a/libavcodec/raw.c +++ b/libavcodec/raw.c @@ -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') }, diff --git a/libavformat/nut.c b/libavformat/nut.c index b148a78db8..7a85961fec 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -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 } };