Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavdevice / alsa-audio.h

diff --git a/libavdevice/alsa-audio.h b/libavdevice/alsa-audio.h
index 8c7c516585033829f53b9b1e35e3617b0fd56fb1..0f467e34c9bf786b5b6de51215a47c6ffd7ea435 100644 (file)
--- a/libavdevice/alsa-audio.h
+++ b/libavdevice/alsa-audio.h
@@ -32,7 +32,8 @@
 
 #include <alsa/asoundlib.h>
 #include "config.h"
-#include "libavformat/avformat.h"
+#include "libavutil/log.h"
+#include "avdevice.h"
 
 /* XXX: we make the assumption that the soundcard accepts this format */
 /* XXX: find better solution with "preinit" method, needed also in
@@ -42,10 +43,13 @@
 typedef void (*ff_reorder_func)(const void *, void *, int);
 
 typedef struct {
+    AVClass *class;
     snd_pcm_t *h;
     int frame_size;  ///< preferred size for reads and writes
     int period_size; ///< bytes per sample * channels
-    ff_reorder_func reorder_func;
+    int sample_rate; ///< sample rate set by user
+    int channels;    ///< number of channels set by user
+    void (*reorder_func)(const void *, void *, int);
     void *reorder_buf;
     int reorder_buf_size; ///< in frames
 } AlsaData;