diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 01:01:15 +0200 |
| commit | 0dce155dd3e52d24c7a0ffbd4be9461170d53de3 (patch) | |
| tree | 0d675e2bbd3fa90303f72708b8533d5d068278f4 /libao2 | |
| parent | db7fe7ce92a229c6529b9b6b2894f325a778ead2 (diff) | |
| parent | 22e310b9aef77477e022874beb388514911ead1e (diff) | |
| download | mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.bz2 mpv-0dce155dd3e52d24c7a0ffbd4be9461170d53de3.tar.xz | |
Merge svn changes up to r30694
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/ao_v4l2.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c index 82c53a226a..8fe4fe9b03 100644 --- a/libao2/ao_v4l2.c +++ b/libao2/ao_v4l2.c @@ -33,6 +33,7 @@ #include "audio_out_internal.h" #include "libaf/af_format.h" #include "libmpdemux/mpeg_packetizer.h" +#include "libvo/vo_v4l2.h" #define MPEG_AUDIO_ID 0x1C0 @@ -144,8 +145,6 @@ get_space (void) static int play (void *data, int len, int flags) { - int v4l2_write (const unsigned char *data, int len); - if (ao_data.format != AF_FORMAT_MPEG2) return 0; |