pvez avi fourcc is truemotion1

[ffmpeg] / libavformat / riff.c

diff --git a/libavformat/riff.c b/libavformat/riff.c
index ed92187b56f6aef900beebb87579f6bd6eef71e3..59a23ae25c878b1d0a2dff0d6ee538ccf7727ffe 100644 (file)
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -1,6 +1,6 @@
 /*
  * RIFF codec tags
- * Copyright (c) 2000 Fabrice Bellard.
+ * Copyright (c) 2000 Fabrice Bellard
  *
  * This file is part of FFmpeg.
  *
@@ -34,6 +34,7 @@ const AVCodecTag codec_bmp_tags[] = {
     { CODEC_ID_H264,         MKTAG('V', 'S', 'S', 'H') },
     { CODEC_ID_H263,         MKTAG('H', '2', '6', '3') },
     { CODEC_ID_H263,         MKTAG('X', '2', '6', '3') },
+    { CODEC_ID_H263,         MKTAG('T', '2', '6', '3') },
     { CODEC_ID_H263,         MKTAG('L', '2', '6', '3') },
     { CODEC_ID_H263,         MKTAG('V', 'X', '1', 'K') },
     { CODEC_ID_H263P,        MKTAG('H', '2', '6', '3') },
@@ -70,6 +71,8 @@ const AVCodecTag codec_bmp_tags[] = {
     { CODEC_ID_MPEG4,        MKTAG('D', 'M', 'K', '2') },
     { CODEC_ID_MPEG4,        MKTAG('D', 'I', 'G', 'I') },
     { CODEC_ID_MPEG4,        MKTAG('I', 'N', 'M', 'C') },
+    { CODEC_ID_MPEG4,        MKTAG('E', 'P', 'H', 'V') }, /* Ephv MPEG-4 */
+    { CODEC_ID_MPEG4,        MKTAG('E', 'M', '4', 'A') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('D', 'I', 'V', '3') }, /* default signature when using MSMPEG4 */
     { CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', '4', '3') },
     { CODEC_ID_MSMPEG4V3,    MKTAG('M', 'P', 'G', '3') },
@@ -158,6 +161,7 @@ const AVCodecTag codec_bmp_tags[] = {
     { CODEC_ID_MSVIDEO1,     MKTAG('w', 'h', 'a', 'm') },
     { CODEC_ID_CINEPAK,      MKTAG('c', 'v', 'i', 'd') },
     { CODEC_ID_TRUEMOTION1,  MKTAG('D', 'U', 'C', 'K') },
+    { CODEC_ID_TRUEMOTION1,  MKTAG('P', 'V', 'E', 'Z') },
     { CODEC_ID_MSZH,         MKTAG('M', 'S', 'Z', 'H') },
     { CODEC_ID_ZLIB,         MKTAG('Z', 'L', 'I', 'B') },
     { CODEC_ID_SNOW,         MKTAG('S', 'N', 'O', 'W') },
@@ -466,7 +470,7 @@ void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssiz
         *au_scale= stream->block_align ? stream->block_align*8 : 8;
         *au_rate = stream->bit_rate ? stream->bit_rate : 8*stream->sample_rate;
     }
-    gcd= ff_gcd(*au_scale, *au_rate);
+    gcd= av_gcd(*au_scale, *au_rate);
     *au_scale /= gcd;
     *au_rate /= gcd;
 }