[Ffmpeg-cvslog] CVS: ffmpeg/libavformat mov.c,1.145,1.146

Baptiste Coudurier CVS bcoudurier
Wed May 10 00:07:51 CEST 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv24367/libavformat

Modified Files:
	mov.c 
Log Message:
assing correct codec_id for mjpegb

Index: mov.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- mov.c	1 May 2006 15:52:57 -0000	1.145
+++ mov.c	9 May 2006 22:07:49 -0000	1.146
@@ -19,7 +19,7 @@
 
 #include <limits.h>
 
-//#define DEBUG
+#define DEBUG
 
 #include "avformat.h"
 #include "avi.h"
@@ -116,7 +116,7 @@
     { CODEC_ID_MJPEG, MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
     { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
     { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
-    { CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
+    { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
     { CODEC_ID_MJPEG, MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */
 /*    { CODEC_ID_MJPEG, MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */
 /*    { CODEC_ID_GIF, MKTAG('g', 'i', 'f', ' ') }, *//* embedded gif files as frames (usually one "click to play movie" frame) */





More information about the ffmpeg-cvslog mailing list