[PATCH] a52: Fix build with older ffmpeg versions.

Colin Guthrie colin at mageia.org
Tue Apr 26 23:55:44 CEST 2011


This fixes a regression introduced in:
  40c129a160f37fe9488b2828d6299f99c269703e
---
 a52/pcm_a52.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c
index 76f21cd..00c7c59 100644
--- a/a52/pcm_a52.c
+++ b/a52/pcm_a52.c
@@ -436,7 +436,11 @@ static int a52_prepare(snd_pcm_ioplug_t *io)
 	rec->avctx->bit_rate = rec->bitrate * 1000;
 	rec->avctx->sample_rate = io->rate;
 	rec->avctx->channels = io->channels;
-	rec->avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 95)
+  rec->avctx->sample_fmt = AV_SAMPLE_FMT_S16;
+#else
+  rec->avctx->sample_fmt = SAMPLE_FMT_S16;
+#endif
 #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
 	switch (io->channels) {
 	case 2:
-- 
1.7.4.4


--------------010302060304020104000209--



More information about the Alsa-devel mailing list