mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

vorbis: drop unneeded check for vorbis_synthesis_restart()

Browse source 
This was added in 1.0.1 more than 16 years ago, I think we
can safely assume this is always present now. Also in tremor.

While at it, bump vorbis requirement to 1.3.1 from 2010.
This commit is contained in:
Tim-Philipp Müller 2019-12-07 14:12:04 +00:00 committed by GStreamer Merge Bot
parent 98ebcb4b8a
commit 72bafd442f
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/vorbis/gstvorbisdec.c
View file

@ -760,11 +760,9 @@ empty_header:
static void static void
vorbis_dec_flush (GstAudioDecoder * dec, gboolean hard) vorbis_dec_flush (GstAudioDecoder * dec, gboolean hard)
{ {
#ifdef HAVE_VORBIS_SYNTHESIS_RESTART
GstVorbisDec *vd = GST_VORBIS_DEC (dec); GstVorbisDec *vd = GST_VORBIS_DEC (dec);
vorbis_synthesis_restart (&vd->vd); vorbis_synthesis_restart (&vd->vd);
#endif
} }
static void static void

10
ext/vorbis/meson.build
View file

@ -15,16 +15,10 @@ vorbisidec_sources = [
'gstvorbiscommon.c', 'gstvorbiscommon.c',
] ]
vorbis_dep = dependency('vorbis', version : '>=1.0', required : get_option('vorbis')) vorbis_dep = dependency('vorbis', version : '>= 1.3.1', required : get_option('vorbis'))
vorbisenc_dep = dependency('vorbisenc', version : '>=1.0', required : get_option('vorbis')) vorbisenc_dep = dependency('vorbisenc', version : '>= 1.3.1', required : get_option('vorbis'))
vorbisidec_dep = dependency('vorbisidec', required : get_option('tremor')) vorbisidec_dep = dependency('vorbisidec', required : get_option('tremor'))
if vorbis_dep.found() or vorbisidec_dep.found()
if cc.has_header_symbol('vorbis/codec.h', 'vorbis_synthesis_restart')
core_conf.set('HAVE_VORBIS_SYNTHESIS_RESTART', true)
endif
endif
if vorbis_dep.found() if vorbis_dep.found()
vorbis_deps = [vorbis_dep] vorbis_deps = [vorbis_dep]
if vorbisenc_dep.found() if vorbisenc_dep.found()