diff options
| author | Arun Raghavan <git@arunraghavan.net> | 2016-04-29 17:35:28 +0530 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2016-04-29 17:38:37 +0530 |
| commit | d1730ab65a5f769ef135e79f2d33a0a4ec47255e (patch) | |
| tree | 020760283e92305edddbb8dd33424b8b9e155c2a | |
| parent | d2a6afcab31f9f8122200ce383fdd5479ca0ebd1 (diff) | |
| download | pulseaudio-d1730ab65a5f769ef135e79f2d33a0a4ec47255e.tar.gz | |
Revert "format: Make pa_format_info_valid() stricter for PCM"
This reverts commit 12a202c510dcacbd2b85fcc1170484eb16fef491.
This is needed for now to avoid a clash in clients using json-glib. The
commit added a call to json_object_get_type() in client code that didn't
exist before, and this breaks some apps like Rhythmbox and Totem. This
will be fixed in the future by possibly dropping json-c as a dep.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=95135
| -rw-r--r-- | src/pulse/format.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/pulse/format.c b/src/pulse/format.c index b07940ae7..c2a1552d1 100644 --- a/src/pulse/format.c +++ b/src/pulse/format.c @@ -101,13 +101,7 @@ void pa_format_info_free(pa_format_info *f) { } int pa_format_info_valid(const pa_format_info *f) { - pa_sample_spec ss; - - if (pa_format_info_is_pcm(f)) { - pa_format_info_to_sample_spec(f, &ss, NULL); - return pa_sample_spec_valid(&ss); - } else - return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); + return (f->encoding >= 0 && f->encoding < PA_ENCODING_MAX && f->plist != NULL); } int pa_format_info_is_pcm(const pa_format_info *f) { |