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
d5ed2343
Commit
d5ed2343
authored
Nov 11, 2009
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/flac: removed the fake flac_ogg_init() fallback
Don't even try to call it with an old libFLAC API.
parent
5bbaf0c9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
flac_compat.h
src/decoder/flac_compat.h
+0
-2
flac_plugin.c
src/decoder/flac_plugin.c
+4
-0
No files found.
src/decoder/flac_compat.h
View file @
d5ed2343
...
@@ -30,8 +30,6 @@
...
@@ -30,8 +30,6 @@
# define flac_decoder FLAC__SeekableStreamDecoder
# define flac_decoder FLAC__SeekableStreamDecoder
# define flac_new() FLAC__seekable_stream_decoder_new()
# define flac_new() FLAC__seekable_stream_decoder_new()
# define flac_ogg_init(a,b,c,d,e,f,g,h,i,j) (0)
# define flac_get_decode_position(x,y) \
# define flac_get_decode_position(x,y) \
FLAC__seekable_stream_decoder_get_decode_position(x,y)
FLAC__seekable_stream_decoder_get_decode_position(x,y)
# define flac_get_state(x) FLAC__seekable_stream_decoder_get_state(x)
# define flac_get_state(x) FLAC__seekable_stream_decoder_get_state(x)
...
...
src/decoder/flac_plugin.c
View file @
d5ed2343
...
@@ -469,6 +469,7 @@ flac_decode_internal(struct decoder * decoder,
...
@@ -469,6 +469,7 @@ flac_decode_internal(struct decoder * decoder,
#endif
#endif
if
(
is_ogg
)
{
if
(
is_ogg
)
{
#if defined(FLAC_API_VERSION_CURRENT) && FLAC_API_VERSION_CURRENT > 7
if
(
!
flac_ogg_init
(
flac_dec
,
flac_read_cb
,
if
(
!
flac_ogg_init
(
flac_dec
,
flac_read_cb
,
flac_seek_cb
,
flac_tell_cb
,
flac_seek_cb
,
flac_tell_cb
,
flac_length_cb
,
flac_eof_cb
,
flac_length_cb
,
flac_eof_cb
,
...
@@ -477,6 +478,9 @@ flac_decode_internal(struct decoder * decoder,
...
@@ -477,6 +478,9 @@ flac_decode_internal(struct decoder * decoder,
err
=
"doing Ogg init()"
;
err
=
"doing Ogg init()"
;
goto
fail
;
goto
fail
;
}
}
#else
goto
fail
;
#endif
}
else
{
}
else
{
if
(
!
flac_init
(
flac_dec
,
flac_read_cb
,
if
(
!
flac_init
(
flac_dec
,
flac_read_cb
,
flac_seek_cb
,
flac_tell_cb
,
flac_seek_cb
,
flac_tell_cb
,
...
...
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