Switch to Libav sample formats everywhere.

Drop 24bit format for now. It should be restored later by properly
distinguishing between internal and packed formats.

1 files changed, 10 insertions, 14 deletions

diff --git a/src/audio_check.h b/src/audio_check.h
index 9f71cf9c..17b8eb5b 100644
--- a/src/audio_check.h
+++ b/src/audio_check.h
@@ -25,31 +25,27 @@
 #include <glib.h>
 #include <stdbool.h>
 
+#include <libavutil/samplefmt.h>
+
 /**
  * The GLib quark used for errors reported by this library.
  */
-G_GNUC_CONST
-static inline GQuark
-audio_format_quark(void)
+static inline GQuark audio_format_quark(void)
 {
-	return g_quark_from_static_string("audio_format");
+    return g_quark_from_static_string("audio_format");
 }
 
-bool
-audio_check_sample_rate(unsigned long sample_rate, GError **error_r);
+bool audio_check_sample_rate(unsigned long sample_rate, GError **error_r);
 
-bool
-audio_check_sample_format(enum sample_format, GError **error_r);
+bool audio_check_sample_format(enum AVSampleFormat, GError **error_r);
 
-bool
-audio_check_channel_count(unsigned sample_format, GError **error_r);
+bool audio_check_channel_count(unsigned sample_format, GError **error_r);
 
 /**
  * Wrapper for audio_format_init(), which checks all attributes.
  */
-bool
-audio_format_init_checked(struct audio_format *af, unsigned long sample_rate,
-			  enum sample_format sample_format, unsigned channels,
-			  GError **error_r);
+bool audio_format_init_checked(struct audio_format *af, unsigned long sample_rate,
+                               enum AVSampleFormat sample_format, unsigned channels,
+                               GError **error_r);
 
 #endif