1 files changed, 9 insertions, 33 deletions

diff --git a/src/audio_format.c b/src/audio_format.c
index 1ac29d1c..f10370fc 100644
--- a/src/audio_format.c
+++ b/src/audio_format.c
@@ -34,7 +34,7 @@ audio_format_mask_apply(struct audio_format *af,
 	if (mask->sample_rate != 0)
 		af->sample_rate = mask->sample_rate;
 
-	if (mask->format != SAMPLE_FORMAT_UNDEFINED)
+	if (mask->format != AV_SAMPLE_FMT_NONE)
 		af->format = mask->format;
 
 	if (mask->channels != 0)
@@ -43,32 +43,20 @@ audio_format_mask_apply(struct audio_format *af,
 	assert(audio_format_valid(af));
 }
 
-const char *
-sample_format_to_string(enum sample_format format)
+const char * sample_format_to_string(enum AVSampleFormat format)
 {
 	switch (format) {
-	case SAMPLE_FORMAT_UNDEFINED:
-		return "?";
-
-	case SAMPLE_FORMAT_S8:
+    case AV_SAMPLE_FMT_U8:
 		return "8";
-
-	case SAMPLE_FORMAT_S16:
+    case AV_SAMPLE_FMT_S16:
 		return "16";
-
-	case SAMPLE_FORMAT_S24_P32:
-		return "24";
-
-	case SAMPLE_FORMAT_S32:
+    case AV_SAMPLE_FMT_S32:
 		return "32";
-
-	case SAMPLE_FORMAT_FLOAT:
+    case AV_SAMPLE_FMT_FLT:
 		return "f";
+    default:
+		return "?";
 	}
-
-	/* unreachable */
-	assert(false);
-	return "?";
 }
 
 const char *
@@ -79,20 +67,8 @@ audio_format_to_string(const struct audio_format *af,
 	assert(s != NULL);
 
 	snprintf(s->buffer, sizeof(s->buffer), "%u:%s:%u",
-		 af->sample_rate, sample_format_to_string(af->format),
+		 af->sample_rate, av_get_sample_fmt_name(af->format),
 		 af->channels);
 
 	return s->buffer;
 }
-
-enum AVSampleFormat sample_fmt_native_to_libav(enum sample_format sample_fmt)
-{
-    switch (sample_fmt) {
-    case SAMPLE_FORMAT_S8:      return AV_SAMPLE_FMT_U8;
-    case SAMPLE_FORMAT_S16:     return AV_SAMPLE_FMT_S16;
-    case SAMPLE_FORMAT_S24_P32:
-    case SAMPLE_FORMAT_S32:     return AV_SAMPLE_FMT_S32;
-    case SAMPLE_FORMAT_FLOAT:   return AV_SAMPLE_FMT_FLT;
-    default:                    return AV_SAMPLE_FMT_NONE;
-    }
-}