summaryrefslogtreecommitdiffstats
path: root/libao2/audio_out.c
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-29 19:20:55 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-07-29 19:20:55 +0000
commitb61b0180623a0f7531624c349e3e06b75a9f46e3 (patch)
tree588a073e854a2db8e285389ad868f8e4993cee10 /libao2/audio_out.c
parent6564720a31551fb2cb2ac0983a142bb028585c4b (diff)
downloadmpv-b61b0180623a0f7531624c349e3e06b75a9f46e3.tar.bz2
mpv-b61b0180623a0f7531624c349e3e06b75a9f46e3.tar.xz
v4l2 audio/video outputs for linux 2.6.22+ kernels (outputs formerly known as ivtv)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23925 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2/audio_out.c')
-rw-r--r--libao2/audio_out.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 7546f43095..4cf00726ec 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -68,6 +68,9 @@ extern ao_functions_t audio_out_dxr2;
#ifdef HAVE_IVTV
extern ao_functions_t audio_out_ivtv;
#endif
+#ifdef HAVE_V4L2_DECODER
+extern ao_functions_t audio_out_v4l2;
+#endif
extern ao_functions_t audio_out_mpegpes;
extern ao_functions_t audio_out_pcm;
extern ao_functions_t audio_out_pss;
@@ -131,6 +134,9 @@ ao_functions_t* audio_out_drivers[] =
#ifdef HAVE_IVTV
&audio_out_ivtv,
#endif
+#ifdef HAVE_V4L2_DECODER
+ &audio_out_v4l2,
+#endif
&audio_out_null,
// should not be auto-selected:
&audio_out_pcm,