Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
e493d0f0
Commit
e493d0f0
authored
Jul 18, 2003
by
Eric Petit
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added 'CDVC' fourcc (another one for DV video)
parent
928fafc3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
modules/codec/ffmpeg/ffmpeg.c
modules/codec/ffmpeg/ffmpeg.c
+2
-1
modules/codec/ffmpeg/ffmpeg.h
modules/codec/ffmpeg/ffmpeg.h
+3
-1
No files found.
modules/codec/ffmpeg/ffmpeg.c
View file @
e493d0f0
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.4
5 2003/07/10 01:33:41 fenri
r Exp $
* $Id: ffmpeg.c,v 1.4
6 2003/07/18 19:26:22 tite
r Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -564,6 +564,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
...
@@ -564,6 +564,7 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
case
FOURCC_dvhd
:
case
FOURCC_dvhd
:
case
FOURCC_dvc
:
case
FOURCC_dvc
:
case
FOURCC_dvp
:
case
FOURCC_dvp
:
case
FOURCC_CDVC
:
i_cat
=
VIDEO_ES
;
i_cat
=
VIDEO_ES
;
i_codec
=
CODEC_ID_DVVIDEO
;
i_codec
=
CODEC_ID_DVVIDEO
;
psz_name
=
"DV video"
;
psz_name
=
"DV video"
;
...
...
modules/codec/ffmpeg/ffmpeg.h
View file @
e493d0f0
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* ffmpeg_vdec.h: video decoder using ffmpeg library
* ffmpeg_vdec.h: video decoder using ffmpeg library
*****************************************************************************
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* Copyright (C) 2001 VideoLAN
* $Id: ffmpeg.h,v 1.2
0 2003/05/21 19:55:25 hartman
Exp $
* $Id: ffmpeg.h,v 1.2
1 2003/07/18 19:26:22 titer
Exp $
*
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
*
...
@@ -158,12 +158,14 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
...
@@ -158,12 +158,14 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
#define FOURCC_WMV2 VLC_FOURCC('W','M','V','2')
#define FOURCC_WMV2 VLC_FOURCC('W','M','V','2')
#define FOURCC_MSS1 VLC_FOURCC('M','S','S','1')
#define FOURCC_MSS1 VLC_FOURCC('M','S','S','1')
/* DV */
#define FOURCC_dvsl VLC_FOURCC('d','v','s','l')
#define FOURCC_dvsl VLC_FOURCC('d','v','s','l')
#define FOURCC_dvsd VLC_FOURCC('d','v','s','d')
#define FOURCC_dvsd VLC_FOURCC('d','v','s','d')
#define FOURCC_DVSD VLC_FOURCC('D','V','S','D')
#define FOURCC_DVSD VLC_FOURCC('D','V','S','D')
#define FOURCC_dvhd VLC_FOURCC('d','v','h','d')
#define FOURCC_dvhd VLC_FOURCC('d','v','h','d')
#define FOURCC_dvc VLC_FOURCC('d','v','c',' ')
#define FOURCC_dvc VLC_FOURCC('d','v','c',' ')
#define FOURCC_dvp VLC_FOURCC('d','v','p',' ')
#define FOURCC_dvp VLC_FOURCC('d','v','p',' ')
#define FOURCC_CDVC VLC_FOURCC('C','D','V','C')
/* Indeo Video Codecs */
/* Indeo Video Codecs */
#define FOURCC_IV31 VLC_FOURCC('I','V','3','1')
#define FOURCC_IV31 VLC_FOURCC('I','V','3','1')
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment