diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-12-04 01:55:52 +0200 |
| commit | 8c144171bb80dd3d1f7161b97675e78cad00bc65 (patch) | |
| tree | 7ad930ebc554ab68af1911f4dfd217cc18b86cce /libao2/ao_v4l2.c | |
| parent | 52ee93c1c64dfaa0afc881c38154b04c100cb617 (diff) | |
| parent | 8c5889004f7ba9f6fcbca20a05a9301771348408 (diff) | |
| download | mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.bz2 mpv-8c144171bb80dd3d1f7161b97675e78cad00bc65.tar.xz | |
Merge svn changes up to r28087
Conflicts:
command.c
libao2/ao_ivtv.c
libao2/ao_v4l2.c
libmpcodecs/dec_video.h
libvo/aspect.h
libvo/sub.c
libvo/sub.h
libvo/vo_directx.c
libvo/vo_macosx.m
libvo/vo_quartz.c
mp_core.h
mplayer.c
mplayer.h
osdep/getch2.h
osdep/timer.h
Diffstat (limited to 'libao2/ao_v4l2.c')
| -rw-r--r-- | libao2/ao_v4l2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libao2/ao_v4l2.c b/libao2/ao_v4l2.c index 4f57d81944..eca46f01ac 100644 --- a/libao2/ao_v4l2.c +++ b/libao2/ao_v4l2.c @@ -144,7 +144,7 @@ get_space (void) static int play (void *data, int len, int flags) { - extern int v4l2_write (const unsigned char *data, int len); + int v4l2_write (const unsigned char *data, int len); if (ao_data.format != AF_FORMAT_MPEG2) return 0; |