Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
e4a08e44
Commit
e4a08e44
authored
Feb 12, 2007
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Conditionaly compile the mux fix as it requires a new (r7593 21/01/07) or newer fffmpeg.
parent
042e6fa3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
1 deletion
+7
-1
modules/codec/ffmpeg/mux.c
modules/codec/ffmpeg/mux.c
+7
-1
No files found.
modules/codec/ffmpeg/mux.c
View file @
e4a08e44
...
@@ -255,7 +255,13 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
...
@@ -255,7 +255,13 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
/* This is a hack */
/* This is a hack */
if
(
i_codec_id
==
CODEC_ID_MP2
)
if
(
i_codec_id
==
CODEC_ID_MP2
)
i_codec_id
=
CODEC_ID_MP3
;
i_codec_id
=
CODEC_ID_MP3
;
codec
->
codec_tag
=
av_codec_get_tag
(
p_sys
->
oc
->
oformat
->
codec_tag
,
i_codec_id
);
//p_input->p_fmt->i_codec;
#if LIBAVFORMAT_VERSION_INT >= ((51<<16)+(8<<8)+0)
codec
->
codec_tag
=
av_codec_get_tag
(
p_sys
->
oc
->
oformat
->
codec_tag
,
i_codec_id
);
#else
# warning "WARNING!!!!!!!"
# warning "Using libavformat muxing with versions older than 51.8.0 (r7593) might produce borken files.
codec
->
codec_tag
=
p_input
->
p_fmt
->
i_codec
;
#endif
codec
->
codec_id
=
i_codec_id
;
codec
->
codec_id
=
i_codec_id
;
if
(
p_input
->
p_fmt
->
i_extra
)
if
(
p_input
->
p_fmt
->
i_extra
)
...
...
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