diff --git a/ChangeLog b/ChangeLog index 8a610ebb73..9994017a7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2004-12-13 Stephane Loeuillet - * docs/random/mimetypes.txt: + * docs/random/mimetypes: + Add FOURCC code for h264 codec (VSSH) Add alternate FOURCC codes for h263 related codecs 2004-12-10 Stefan Kost diff --git a/docs/random/mimetypes b/docs/random/mimetypes index 1aaeb17b35..c89c3b7f54 100644 --- a/docs/random/mimetypes +++ b/docs/random/mimetypes @@ -238,7 +238,7 @@ framerate = 0 - MAXFLOAT (FLOAT) 6 - H263 and related codecs MIME type: video/x-h263 Properties: - Known fourccs: H263, i263, L263, M263/m263, s263, x263, VDOW, VIVO + Known fourccs: H263/h263, i263, L263, M263/m263, s263, x263, VDOW, VIVO Encoder: ffenc_h263, ffenc_h263p Decoder: ffdec_h263, ffdec_h263i @@ -311,6 +311,7 @@ framerate = 0 - MAXFLOAT (FLOAT) 17 - H264 MIME type: video/x-h264 Properties: + Known fourccs: VSSH Encoder: Decoder: ffdec_h264