adxenc: remove unneeded log message

[ffmpeg] / libavformat / nut.c

diff --git a/libavformat/nut.c b/libavformat/nut.c
index 7a85961fec23c3eca65f4cb72679f948930e21ec..ac62d4ff4cbc9e1dce40216e40236cbfad527154 100644 (file)
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -2,23 +2,24 @@
  * nut
  * Copyright (c) 2004-2007 Michael Niedermayer
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/mathematics.h"
 #include "libavutil/tree.h"
 #include "nut.h"
 #include "internal.h"
@@ -40,6 +41,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 +64,18 @@ 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('B', 'G', 'R', 48 ) },
     { 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('Y', '3', 11 , 10 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(10 , 11 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 10 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3',  0 , 10 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(10 ,  0 , '3', 'Y') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '1',  0 , 16 ) },
     { CODEC_ID_RAWVIDEO, MKTAG(16 ,  0 , '1', 'Y') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) },