diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-05-09 22:07:49 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-05-09 22:07:49 +0000 |
| commit | 750b4aaabb6813b98b36439486b0935e7bc74172 (patch) | |
| tree | c886412b01c87c399fa25ba22077e5b0fe5a7edd /libavformat/mov.c | |
| parent | 89ca8c497fdf585c6f0d72f9a39f23dc84f0630e (diff) | |
| download | ffmpeg-750b4aaabb6813b98b36439486b0935e7bc74172.tar.gz | |
assing correct codec_id for mjpegb
Originally committed as revision 5353 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 6147d1f849..1e4d0ecb68 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -19,7 +19,7 @@ #include <limits.h> -//#define DEBUG +#define DEBUG #include "avformat.h" #include "avi.h" @@ -116,7 +116,7 @@ static const CodecTag mov_video_tags[] = { { 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) */ |