Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / nut.c

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 0a44811c57661a72eccb6b2a72f74ea68549d236..953ec3679e56caa28c251bd928d08bd094bc0d9f 100644 (file)
--- 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') },
@@ -70,6 +74,10 @@ const AVCodecTag ff_nut_video_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 48 ) },
     { CODEC_ID_RAWVIDEO, MKTAG(48 , 'B', 'G', 'R') },
     { CODEC_ID_RAWVIDEO, MKTAG(48 , 'R', 'G', 'B') },
+    { CODEC_ID_RAWVIDEO, MKTAG('B', 'R', 'A', 64 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG('R', 'B', 'A', 64 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(64 , 'B', 'R', 'A') },
+    { CODEC_ID_RAWVIDEO, MKTAG(64 , 'R', 'B', 'A') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 10 ) },
     { CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) },