Export metadata in the generic format. Deprecate old conversion API.

[ffmpeg] / libavformat / nut.c

diff --git a/libavformat/nut.c b/libavformat/nut.c
index b148a78db8cd8a0ca4ae5c19a9254aabe068a9b0..1c5a13994be1760a4c9ba51b01ba525a7c06a39b 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -40,6 +40,10 @@ const AVCodecTag ff_nut_video_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG(15 , 'R', 'G', 'B') },
     { CODEC_ID_RAWVIDEO, MKTAG(16 , 'B', 'G', 'R') },
     { CODEC_ID_RAWVIDEO, MKTAG(16 , 'R', 'G', 'B') },
+    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 12 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 12 ) },
+    { 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('B', 'G', 'R', 'A') },
     { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
@@ -59,8 +63,20 @@ const AVCodecTag ff_nut_video_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B',  8 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R',  4 ) },
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B',  4 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG('B', '4', 'B', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('R', '4', 'B', 'Y') },
     { 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                         }
 };