Changeset 7ebdd5ba79f1ef402190e61fb0bae5d4cf113978
- Timestamp:
- 24/03/03 14:50:55
(6 years ago)
- Author:
- Derk-Jan Hartman <hartman@videolan.org>
- git-committer:
- Derk-Jan Hartman <hartman@videolan.org> 1048513855 +0000
- git-parent:
[eb0eac06d7d6d85fe9a88c3184d70de9d13ca0d9]
- git-author:
- Derk-Jan Hartman <hartman@videolan.org> 1048513855 +0000
- Message:
* Added fourcc 'MSS1' which is equivalent to 'WMV2'
-
Files:
-
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
| r2b4c0fc |
r7ebdd5b |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 1999-2001 VideoLAN |
|---|
| 5 | | * $Id: ffmpeg.c,v 1.27 2003/03/13 16:09:20 hartman Exp $ |
|---|
| | 5 | * $Id: ffmpeg.c,v 1.28 2003/03/24 13:50:55 hartman Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Laurent Aimar <fenrir@via.ecp.fr> |
|---|
| … | … | |
| 498 | 498 | break; |
|---|
| 499 | 499 | case FOURCC_WMV2: |
|---|
| | 500 | case FOURCC_MSS1: |
|---|
| 500 | 501 | i_cat = VIDEO_ES; |
|---|
| 501 | 502 | i_codec = CODEC_ID_WMV2; |
|---|
| r2b4c0fc |
r7ebdd5b |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 2001 VideoLAN |
|---|
| 5 | | * $Id: ffmpeg.h,v 1.14 2003/03/13 16:09:20 hartman Exp $ |
|---|
| | 5 | * $Id: ffmpeg.h,v 1.15 2003/03/24 13:50:55 hartman Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Laurent Aimar <fenrir@via.ecp.fr> |
|---|
| … | … | |
| 150 | 150 | #define FOURCC_WMV1 VLC_FOURCC('W','M','V','1') |
|---|
| 151 | 151 | #define FOURCC_WMV2 VLC_FOURCC('W','M','V','2') |
|---|
| | 152 | #define FOURCC_MSS1 VLC_FOURCC('M','S','S','1') |
|---|
| 152 | 153 | |
|---|
| 153 | 154 | #define FOURCC_dvsl VLC_FOURCC('d','v','s','l') |
|---|
| r7a1e7c0 |
r7ebdd5b |
|
| 3 | 3 | ***************************************************************************** |
|---|
| 4 | 4 | * Copyright (C) 1999-2001 VideoLAN |
|---|
| 5 | | * $Id: video.c,v 1.18 2003/03/15 18:44:31 fenrir Exp $ |
|---|
| | 5 | * $Id: video.c,v 1.19 2003/03/24 13:50:55 hartman Exp $ |
|---|
| 6 | 6 | * |
|---|
| 7 | 7 | * Authors: Laurent Aimar <fenrir@via.ecp.fr> |
|---|
| … | … | |
| 281 | 281 | p_vdec->p_fifo->i_fourcc == FOURCC_m4s2 || |
|---|
| 282 | 282 | p_vdec->p_fifo->i_fourcc == FOURCC_WMV2 || |
|---|
| | 283 | p_vdec->p_fifo->i_fourcc == FOURCC_MSS1 || |
|---|
| 283 | 284 | p_vdec->p_fifo->i_fourcc == FOURCC_MJPG || |
|---|
| 284 | 285 | p_vdec->p_fifo->i_fourcc == FOURCC_mjpg || |
|---|
