Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
4be60f72
Commit
4be60f72
authored
21 years ago
by
Laurent Aimar
Browse files
Options
Downloads
Patches
Plain Diff
* ffmpeg: added m4cc and M4CC as MPEG4 fourcc.
parent
035904be
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/codec/ffmpeg/ffmpeg.c
+3
-1
3 additions, 1 deletion
modules/codec/ffmpeg/ffmpeg.c
modules/codec/ffmpeg/ffmpeg.h
+3
-1
3 additions, 1 deletion
modules/codec/ffmpeg/ffmpeg.h
with
6 additions
and
2 deletions
modules/codec/ffmpeg/ffmpeg.c
+
3
−
1
View file @
4be60f72
...
...
@@ -2,7 +2,7 @@
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
* $Id: ffmpeg.c,v 1.4
7
2003/08/
08 17:08:32 gbazin
Exp $
* $Id: ffmpeg.c,v 1.4
8
2003/08/
15 13:16:38 fenrir
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -504,6 +504,8 @@ static int ffmpeg_GetFfmpegCodec( vlc_fourcc_t i_fourcc,
case
FOURCC_DX50
:
case
FOURCC_mp4v
:
case
FOURCC_4
:
case
FOURCC_m4cc
:
case
FOURCC_M4CC
:
/* 3iv1 is unsupported by ffmpeg
putting it here gives extreme distorted images
case FOURCC_3IV1:
...
...
This diff is collapsed.
Click to expand it.
modules/codec/ffmpeg/ffmpeg.h
+
3
−
1
View file @
4be60f72
...
...
@@ -2,7 +2,7 @@
* ffmpeg_vdec.h: video decoder using ffmpeg library
*****************************************************************************
* Copyright (C) 2001 VideoLAN
* $Id: ffmpeg.h,v 1.2
2
2003/08/
08 17:08:32 gbazin
Exp $
* $Id: ffmpeg.h,v 1.2
3
2003/08/
15 13:16:38 fenrir
Exp $
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
...
...
@@ -88,6 +88,8 @@ int E_( GetPESData )( u8 *p_buf, int i_max, pes_packet_t *p_pes );
#define FOURCC_DX50 VLC_FOURCC('D','X','5','0')
#define FOURCC_mp4v VLC_FOURCC('m','p','4','v')
#define FOURCC_4 VLC_FOURCC( 4, 0, 0, 0 )
#define FOURCC_m4cc VLC_FOURCC('m','4','c','c')
#define FOURCC_M4CC VLC_FOURCC('M','4','C','C')
/* MSMPEG4 v2 */
#define FOURCC_MPG4 VLC_FOURCC('M','P','G','4')
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment