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

1 files changed, 15 insertions, 15 deletions

diff --git a/vobsub.h b/vobsub.h
index 1699ebdf70..c14ce9c711 100644
--- a/vobsub.h
+++ b/vobsub.h
@@ -1,30 +1,30 @@
 #ifndef MPLAYER_VOBSUB_H
 #define MPLAYER_VOBSUB_H
 
-extern void *vobsub_open(const char *subname, const char *const ifo, const int force, void** spu);
-extern void vobsub_reset(void *vob);
-extern int vobsub_parse_ifo(void* this, const char *const name, unsigned int *palette, unsigned int *width, unsigned int *height, int force, int sid, char *langid);
-extern int vobsub_get_packet(void *vobhandle, float pts,void** data, int* timestamp);
-extern int vobsub_get_next_packet(void *vobhandle, void** data, int* timestamp);
-extern void vobsub_close(void *this);
-extern unsigned int vobsub_get_indexes_count(void * /* vobhandle */);
-extern char *vobsub_get_id(void * /* vobhandle */, unsigned int /* index */);
+void *vobsub_open(const char *subname, const char *const ifo, const int force, void** spu);
+void vobsub_reset(void *vob);
+int vobsub_parse_ifo(void* this, const char *const name, unsigned int *palette, unsigned int *width, unsigned int *height, int force, int sid, char *langid);
+int vobsub_get_packet(void *vobhandle, float pts,void** data, int* timestamp);
+int vobsub_get_next_packet(void *vobhandle, void** data, int* timestamp);
+void vobsub_close(void *this);
+unsigned int vobsub_get_indexes_count(void * /* vobhandle */);
+char *vobsub_get_id(void * /* vobhandle */, unsigned int /* index */);
 
 /// Get vobsub id by its index in the valid streams.
-extern int vobsub_get_id_by_index(void *vobhandle, unsigned int index);
+int vobsub_get_id_by_index(void *vobhandle, unsigned int index);
 /// Get index in the valid streams by vobsub id.
-extern int vobsub_get_index_by_id(void *vobhandle, int id);
+int vobsub_get_index_by_id(void *vobhandle, int id);
 
 /// Convert palette value in idx file to yuv.
 unsigned int vobsub_palette_to_yuv(unsigned int pal);
 /// Convert rgb value to yuv.
 unsigned int vobsub_rgb_to_yuv(unsigned int rgb);
 
-extern void *vobsub_out_open(const char *basename, const unsigned int *palette, unsigned int orig_width, unsigned int orig_height, const char *id, unsigned int index);
-extern void vobsub_out_output(void *me, const unsigned char *packet, int len, double pts);
-extern void vobsub_out_close(void *me);
-extern int vobsub_set_from_lang(void *vobhandle, unsigned char * lang);
-extern void vobsub_seek(void * vobhandle, float pts);
+void *vobsub_out_open(const char *basename, const unsigned int *palette, unsigned int orig_width, unsigned int orig_height, const char *id, unsigned int index);
+void vobsub_out_output(void *me, const unsigned char *packet, int len, double pts);
+void vobsub_out_close(void *me);
+int vobsub_set_from_lang(void *vobhandle, unsigned char * lang);
+void vobsub_seek(void * vobhandle, float pts);
 
 #endif /* MPLAYER_VOBSUB_H */