aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-16 07:56:31 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-05-16 07:56:31 +0000
commit73762de18e87b4e8f50f503ba726d7fabd9b2179 (patch)
treeebf9371aba19c1e3a055c3bc989e79af1fc3af8b
parentc75b3d2e8fdcd1742a139d6628234a15ff8b4ba4 (diff)
downloadffmpeg-73762de18e87b4e8f50f503ba726d7fabd9b2179.tar.gz
Add NV12 and NV21 AVI tags.
Both are listed in fourcc.org. Originally committed as revision 23145 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/raw.c2
-rw-r--r--libavformat/riff.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index 06ae440819..b72dd25d05 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -64,6 +64,8 @@ const PixelFormatTag ff_raw_pixelFormatTags[] = {
{ PIX_FMT_UYVY422, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
{ PIX_FMT_UYYVYY411, MKTAG('Y', '4', '1', '1') },
{ PIX_FMT_GRAY8, MKTAG('G', 'R', 'E', 'Y') },
+ { PIX_FMT_NV12, MKTAG('N', 'V', '1', '2') },
+ { PIX_FMT_NV21, MKTAG('N', 'V', '2', '1') },
/* nut */
{ PIX_FMT_RGB555LE, MKTAG('R', 'G', 'B', 15) },
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 4355863c4b..4cbdd01b81 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -169,6 +169,8 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ CODEC_ID_RAWVIDEO, MKTAG('Y', 'V', 'U', '9') },
{ CODEC_ID_RAWVIDEO, MKTAG('V', 'D', 'T', 'Z') }, /* SoftLab-NSK VideoTizer */
{ CODEC_ID_RAWVIDEO, MKTAG('Y', '4', '1', '1') },
+ { CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '1', '2') },
+ { CODEC_ID_RAWVIDEO, MKTAG('N', 'V', '2', '1') },
{ CODEC_ID_FRWU, MKTAG('F', 'R', 'W', 'U') },
{ CODEC_ID_R210, MKTAG('r', '2', '1', '0') },
{ CODEC_ID_V210, MKTAG('v', '2', '1', '0') },