Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
49776bde
Commit
49776bde
authored
Jul 12, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check for CODEC_TYPE_ATTACHMENT for outdated ffmpeg library (more than 7
month old)
parent
4433dd43
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
modules/demux/avformat/demux.c
modules/demux/avformat/demux.c
+4
-1
No files found.
modules/demux/avformat/demux.c
View file @
49776bde
...
@@ -51,6 +51,8 @@
...
@@ -51,6 +51,8 @@
/* Version checking */
/* Version checking */
#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
#define HAVE_FFMPEG_CODEC_ATTACHMENT (LIBAVCODEC_VERSION_INT >= ((51<<16)+(50<<8)+0) )
/*****************************************************************************
/*****************************************************************************
* demux_sys_t: demux descriptor
* demux_sys_t: demux descriptor
*****************************************************************************/
*****************************************************************************/
...
@@ -244,9 +246,10 @@ int OpenDemux( vlc_object_t *p_this )
...
@@ -244,9 +246,10 @@ int OpenDemux( vlc_object_t *p_this )
es_format_Init
(
&
fmt
,
UNKNOWN_ES
,
0
);
es_format_Init
(
&
fmt
,
UNKNOWN_ES
,
0
);
if
(
cc
->
codec_type
==
CODEC_TYPE_DATA
)
if
(
cc
->
codec_type
==
CODEC_TYPE_DATA
)
psz_type
=
"data"
;
psz_type
=
"data"
;
#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
else
if
(
cc
->
codec_type
==
CODEC_TYPE_ATTACHMENT
)
else
if
(
cc
->
codec_type
==
CODEC_TYPE_ATTACHMENT
)
psz_type
=
"attachment"
;
psz_type
=
"attachment"
;
#endif
msg_Warn
(
p_demux
,
"unsupported track type in ffmpeg demux"
);
msg_Warn
(
p_demux
,
"unsupported track type in ffmpeg demux"
);
break
;
break
;
}
}
...
...
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