projects / packages / avifile.git / blame
| Commit | Line | Data |
|---|---|---|
| 0305728f JR |
1 | diff -ur avifile0.7-20020412/include/fourcc.h avifile0.7-20020412.xvid/include/fourcc.h |
| 2 | --- avifile0.7-20020412/include/fourcc.h Tue Apr 2 11:24:58 2002 | |
| 3 | +++ avifile0.7-20020412.xvid/include/fourcc.h Tue Jun 11 01:10:21 2002 | |
| 4 | @@ -104,7 +104,8 @@ | |
| 5 | #define RIFFINFO_ASV2 mmioFOURCC('A', 'S', 'V', '2') | |
| 6 | ||
| 7 | /* let's give some FCC to Xvid */ | |
| 8 | -#define RIFFINFO_XVID mmioFOURCC('X', 'v', 'i', 'D') | |
| 9 | +#define RIFFINFO_XviD mmioFOURCC('X', 'v', 'i', 'D') | |
| 10 | +#define RIFFINFO_XVID mmioFOURCC('X', 'V', 'I', 'D') | |
| 11 | ||
| 12 | /* Microsoft video */ | |
| 13 | #define RIFFINFO_CRAM mmioFOURCC('C', 'R', 'A', 'M') | |
| 14 | @@ -235,6 +236,7 @@ | |
| 15 | #define fccMJPG RIFFINFO_MJPG | |
| 16 | #define fccmjpg RIFFINFO_mjpg | |
| 17 | #define fccHFYU RIFFINFO_HFYU | |
| 18 | +#define fccXviD RIFFINFO_XviD | |
| 19 | #define fccXVID RIFFINFO_XVID | |
| 20 | #define fccCVID RIFFINFO_CVID | |
| 21 | #define fcccvid RIFFINFO_cvid | |
| 22 | diff -ur avifile0.7-20020412/plugins/libwin32/fillplugins.h avifile0.7-20020412.xvid/plugins/libwin32/fillplugins.h | |
| 23 | --- avifile0.7-20020412/plugins/libwin32/fillplugins.h Mon Apr 8 09:47:50 2002 | |
| 24 | +++ avifile0.7-20020412.xvid/plugins/libwin32/fillplugins.h Tue Jun 11 01:11:41 2002 | |
| 25 | @@ -401,6 +401,7 @@ | |
| 26 | "http://www.geocities.com/avihpit/xvid/post.html"; | |
| 27 | static const fourcc_t xvid_codecs[] = | |
| 28 | { | |
| 29 | + fccXviD, | |
| 30 | fccXVID, | |
| 31 | fccDIVX, fccdivx, 0 | |
| 32 | }; | |
| 33 | diff -ur avifile0.7-20020412/plugins/libwin32/libwin32.cpp avifile0.7-20020412.xvid/plugins/libwin32/libwin32.cpp | |
| 34 | --- avifile0.7-20020412/plugins/libwin32/libwin32.cpp Thu Apr 4 22:16:07 2002 | |
| 35 | +++ avifile0.7-20020412.xvid/plugins/libwin32/libwin32.cpp Tue Jun 11 01:12:17 2002 | |
| 36 | @@ -284,6 +284,7 @@ | |
| 37 | || strcmp(attribute, "strSettings") == 0) | |
| 38 | return GetRegValue(vp31name, attribute, 0, &value, 0); | |
| 39 | break; | |
| 40 | + case fccXviD: | |
| 41 | case fccXVID: | |
| 42 | return GetRegValue(xvidname, attribute, 0, &value, 0); | |
| 43 | case fccMJPG: | |
| 44 | @@ -370,6 +371,7 @@ | |
| 45 | || strcmp(attribute, "strSettings") == 0) | |
| 46 | return SetRegValue(vp31name, attribute, value, 0); | |
| 47 | break; | |
| 48 | + case fccXviD: | |
| 49 | case fccXVID: | |
| 50 | return SetRegValue(xvidname, attribute, value, 0); | |
| 51 | case fccMJPG: | |
| 52 | diff -ur avifile0.7-20020412/plugins/libwin32/videocodec/VideoDecoder.cpp avifile0.7-20020412.xvid/plugins/libwin32/videocodec/VideoDecoder.cpp | |
| 53 | --- avifile0.7-20020412/plugins/libwin32/videocodec/VideoDecoder.cpp Mon Apr 8 09:47:51 2002 | |
| 54 | +++ avifile0.7-20020412.xvid/plugins/libwin32/videocodec/VideoDecoder.cpp Tue Jun 11 01:12:36 2002 | |
| 55 | @@ -402,6 +402,7 @@ | |
| 56 | ||
| 57 | switch (m_Info.fourcc) | |
| 58 | { | |
| 59 | + case fccXviD: | |
| 60 | case fccXVID: | |
| 61 | if (m_bitrick.biCompression == 0 || m_bitrick.biCompression == 3) | |
| 62 | break; | |
| 63 | diff -ur avifile0.7-20020412/plugins/libxvid/fillplugins.h avifile0.7-20020412.xvid/plugins/libxvid/fillplugins.h | |
| 64 | --- avifile0.7-20020412/plugins/libxvid/fillplugins.h Mon Apr 8 09:47:51 2002 | |
| 65 | +++ avifile0.7-20020412.xvid/plugins/libxvid/fillplugins.h Tue Jun 11 01:11:15 2002 | |
| 66 | @@ -11,6 +11,7 @@ | |
| 67 | static char xvid_about[] = "XviD Linux codec"; | |
| 68 | static const fourcc_t xvid_codecs[] = | |
| 69 | { | |
| 70 | + fccXviD, | |
| 71 | fccXVID, | |
| 72 | fccDIVX, fccdivx, 0 | |
| 73 | }; |