Associate the 0x6c75 TwoCC used in certain Kodak cameras

[ffmpeg] / libavformat / txd.c

diff --git a/libavformat/txd.c b/libavformat/txd.c
index d2c399697b56934fea991029b0402d19356ec5c8..0fd33e600d9472e6de6fc44448b72f1dc11e68f1 100644 (file)
--- a/libavformat/txd.c
+++ b/libavformat/txd.c
@@ -19,6 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include "libavutil/intreadwrite.h"
 #include "avformat.h"
 
 #define TXD_FILE            0x16
@@ -63,7 +64,7 @@ next_chunk:
     if (url_feof(s->pb))
         return AVERROR(EIO);
     if (marker != TXD_MARKER && marker != TXD_MARKER2) {
-        av_log(NULL, AV_LOG_ERROR, "marker does not match\n");
+        av_log(s, AV_LOG_ERROR, "marker does not match\n");
         return AVERROR(EIO);
     }
 
@@ -77,7 +78,7 @@ next_chunk:
         case TXD_TEXTURE:
             goto next_chunk;
         default:
-            av_log(NULL, AV_LOG_ERROR, "unknown chunk id %i\n", id);
+            av_log(s, AV_LOG_ERROR, "unknown chunk id %i\n", id);
             return AVERROR(EIO);
     }
 
@@ -90,7 +91,7 @@ next_chunk:
 AVInputFormat txd_demuxer =
 {
     "txd",
-    NULL_IF_CONFIG_SMALL("txd format"),
+    NULL_IF_CONFIG_SMALL("Renderware TeXture Dictionary"),
     0,
     txd_probe,
     txd_read_header,