[vlc-commits] commit: Added VLC_CODEC_NV12 to vlc_fourcc.h. (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat May  8 10:29:31 2010 +0200| [287ccf14085d974b8ad2c5d238fb6c95d1fc660f] | committer: Laurent Aimar 

Added VLC_CODEC_NV12 to vlc_fourcc.h.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=287ccf14085d974b8ad2c5d238fb6c95d1fc660f
---

 include/vlc_fourcc.h          |    2 ++
 modules/codec/avcodec/dxva2.c |    1 -
 src/misc/fourcc.c             |    3 +++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index ad68648..407b57d 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -173,6 +173,8 @@
 #define VLC_CODEC_CYUV      VLC_FOURCC('c','y','u','v')
 /* 10-bit 4:2:2 Component YCbCr */
 #define VLC_CODEC_V210      VLC_FOURCC('v','2','1','0')
+/* Planar Y Packet UV (420) */
+#define VLC_CODEC_NV12      VLC_FOURCC('N','V','1','2')
 
 /* Image codec (video) */
 #define VLC_CODEC_PNG       VLC_FOURCC('p','n','g',' ')
diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c
index 054d6ea..74c7d12 100644
--- a/modules/codec/avcodec/dxva2.c
+++ b/modules/codec/avcodec/dxva2.c
@@ -180,7 +180,6 @@ static const dxva2_mode_t *Dxva2FindMode(const GUID *guid)
 }
 
 /* */
-#define VLC_CODEC_NV12 VLC_FOURCC('N','V','1','2') /* TODO move to vlc_fourcc.h */
 typedef struct {
     const char   *name;
     D3DFORMAT    format;
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 82545fd..34a931d 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -700,6 +700,9 @@ static const entry_t p_list_video[] = {
     B(VLC_CODEC_V210, "10-bit 4:2:2 Component YCbCr"),
         A("v210"),
 
+    B(VLC_CODEC_NV12, "Planar  Y, Packet UV (420)"),
+        A("NV12"),
+
     /* Videogames Codecs */
 
     /* Interplay MVE */