From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Thu, 9 Feb 2012 22:20:48 +0000 (+0100)
Subject: Allow encoding rawvideo RGB0 and friends.
X-Git-Tag: android-x86-4.4-r1~13465
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5c2c6bbf;p=android-x86%2Fexternal-ffmpeg.git

Allow encoding rawvideo RGB0 and friends.
---

diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index cfa650ee6b..320c4f4cb1 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -83,9 +83,13 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { PIX_FMT_RGB444BE, MKTAG(12 , 'B', 'G', 'R') },
     { PIX_FMT_BGR444BE, MKTAG(12 , 'R', 'G', 'B') },
     { PIX_FMT_RGBA,     MKTAG('R', 'G', 'B', 'A') },
+    { PIX_FMT_RGB0,     MKTAG('R', 'G', 'B',  0 ) },
     { PIX_FMT_BGRA,     MKTAG('B', 'G', 'R', 'A') },
+    { PIX_FMT_BGR0,     MKTAG('B', 'G', 'R',  0 ) },
     { PIX_FMT_ABGR,     MKTAG('A', 'B', 'G', 'R') },
+    { PIX_FMT_0BGR,     MKTAG( 0 , 'B', 'G', 'R') },
     { PIX_FMT_ARGB,     MKTAG('A', 'R', 'G', 'B') },
+    { PIX_FMT_0RGB,     MKTAG( 0 , 'R', 'G', 'B') },
     { PIX_FMT_RGB24,    MKTAG('R', 'G', 'B', 24 ) },
     { PIX_FMT_BGR24,    MKTAG('B', 'G', 'R', 24 ) },
     { PIX_FMT_YUV411P,  MKTAG('4', '1', '1', 'P') },
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 0a44811c57..b17beea68b 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -46,9 +46,13 @@ const AVCodecTag ff_nut_video_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG(12 , 'B', 'G', 'R') },
     { CODEC_ID_RAWVIDEO, MKTAG(12 , 'R', 'G', 'B') },
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
+    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B',  0 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
+    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R',  0 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
+    { CODEC_ID_RAWVIDEO, MKTAG( 0 , 'B', 'G', 'R') },
     { CODEC_ID_RAWVIDEO, MKTAG('A', 'R', 'G', 'B') },
+    { CODEC_ID_RAWVIDEO, MKTAG( 0 , 'R', 'G', 'B') },
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 24 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 24 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('4', '1', '1', 'P') },