From: Tim-Philipp Müller <tim@centricular.com>
Date: Sat, 7 Dec 2019 14:12:04 +0000 (+0000)
Subject: vorbis: drop unneeded check for vorbis_synthesis_restart()
X-Git-Tag: 1.19.3~511^2~840
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72bafd442f980852356225e8c96872a0989b0eb4;p=platform%2Fupstream%2Fgstreamer.git

vorbis: drop unneeded check for vorbis_synthesis_restart()

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.
---

diff --git a/ext/vorbis/gstvorbisdec.c b/ext/vorbis/gstvorbisdec.c
index cd44d1d..bb865d7 100644
--- a/ext/vorbis/gstvorbisdec.c
+++ b/ext/vorbis/gstvorbisdec.c
@@ -760,11 +760,9 @@ empty_header:
 static void
 vorbis_dec_flush (GstAudioDecoder * dec, gboolean hard)
 {
-#ifdef HAVE_VORBIS_SYNTHESIS_RESTART
   GstVorbisDec *vd = GST_VORBIS_DEC (dec);
 
   vorbis_synthesis_restart (&vd->vd);
-#endif
 }
 
 static void
diff --git a/ext/vorbis/meson.build b/ext/vorbis/meson.build
index f008d84..4600106 100644
--- a/ext/vorbis/meson.build
+++ b/ext/vorbis/meson.build
@@ -15,16 +15,10 @@ vorbisidec_sources = [
   'gstvorbiscommon.c',
 ]
 
-vorbis_dep = dependency('vorbis', version : '>=1.0', required : get_option('vorbis'))
-vorbisenc_dep = dependency('vorbisenc', 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.3.1', required : get_option('vorbis'))
 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()
   vorbis_deps = [vorbis_dep]
   if vorbisenc_dep.found()