Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
3be20518
Commit
3be20518
authored
Mar 01, 2017
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/Thread: check ENABLE_FFMPEG, not HAVE_FFMPEG
This repairs the damage to commit
74dbaade
done by commit
b3f5b493
parent
ff32b0dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
NEWS
NEWS
+1
-0
DecoderThread.cxx
src/decoder/DecoderThread.cxx
+1
-1
No files found.
NEWS
View file @
3be20518
ver 0.20.6 (not yet released)
* decoder
- ffmpeg: re-enable as fallback
- mpcdec: fix crash (division by zero) after seeking
* workaround for GCC 4.9.4 / libstdc++ bug (build failure)
...
...
src/decoder/DecoderThread.cxx
View file @
3be20518
...
...
@@ -235,7 +235,7 @@ decoder_run_stream_fallback(DecoderBridge &bridge, InputStream &is)
{
const
struct
DecoderPlugin
*
plugin
;
#ifdef
HAV
E_FFMPEG
#ifdef
ENABL
E_FFMPEG
plugin
=
decoder_plugin_from_name
(
"ffmpeg"
);
#else
plugin
=
decoder_plugin_from_name
(
"mad"
);
...
...
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