summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-12-03 15:23:30 +0000
committerDiego Biurrun <diego@biurrun.de>2008-12-03 15:23:30 +0000
commit9686df2be543b740ec71e6ef633f312b8592813f (patch)
tree19f9d20b719c124cba7a6f878d0f84e1c0c82ed3 /libavformat
parent26ae363e06722389964dae79e1f19a0a7f66b6d0 (diff)
Delete unnecessary 'extern' keywords.
Originally committed as revision 15990 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/asf.c2
-rw-r--r--libavformat/framehook.h6
-rw-r--r--libavformat/mpegts.c4
-rw-r--r--libavformat/oggdec.h2
-rw-r--r--libavformat/oggparsevorbis.c2
-rw-r--r--libavformat/os_support.h2
6 files changed, 9 insertions, 9 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c
index 0faa46fae8..695cfeca75 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -26,7 +26,7 @@
#include "asf.h"
#include "asfcrypt.h"
-extern void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
+void ff_mms_set_stream_selection(URLContext *h, AVFormatContext *format);
#undef NDEBUG
#include <assert.h>
diff --git a/libavformat/framehook.h b/libavformat/framehook.h
index 9dc144b0d4..0bad6067ac 100644
--- a/libavformat/framehook.h
+++ b/libavformat/framehook.h
@@ -45,8 +45,8 @@ typedef void (FrameHookRelease)(void *ctx);
typedef FrameHookRelease *FrameHookReleaseFn;
extern FrameHookRelease Release;
-extern int frame_hook_add(int argc, char *argv[]);
-extern void frame_hook_process(struct AVPicture *pict, enum PixelFormat pix_fmt, int width, int height, int64_t pts);
-extern void frame_hook_release(void);
+int frame_hook_add(int argc, char *argv[]);
+void frame_hook_process(struct AVPicture *pict, enum PixelFormat pix_fmt, int width, int height, int64_t pts);
+void frame_hook_release(void);
#endif /* AVFORMAT_FRAMEHOOK_H */
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 48aca43d46..f1212853ba 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -38,8 +38,8 @@ typedef struct PESContext PESContext;
static PESContext* add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid, int stream_type);
static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code);
-extern void av_set_program_name(AVProgram *program, char *provider_name, char *name);
-extern void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
+void av_set_program_name(AVProgram *program, char *provider_name, char *name);
+void av_program_add_stream_index(AVFormatContext *ac, int progid, unsigned int idx);
enum MpegTSFilterType {
MPEGTS_PES,
diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
index 1a73fe0bcb..d238e99a4b 100644
--- a/libavformat/oggdec.h
+++ b/libavformat/oggdec.h
@@ -85,6 +85,6 @@ extern const struct ogg_codec ff_speex_codec;
extern const struct ogg_codec ff_theora_codec;
extern const struct ogg_codec ff_vorbis_codec;
-extern int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
+int vorbis_comment(AVFormatContext *ms, uint8_t *buf, int size);
#endif /* AVFORMAT_OGGDEC_H */
diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 1f0bcfe89c..a1eb20dea2 100644
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -30,7 +30,7 @@
#include "avformat.h"
#include "oggdec.h"
-extern int
+int
vorbis_comment(AVFormatContext * as, uint8_t *buf, int size)
{
const uint8_t *p = buf;
diff --git a/libavformat/os_support.h b/libavformat/os_support.h
index 2fd3112b7e..0b6a292d6d 100644
--- a/libavformat/os_support.h
+++ b/libavformat/os_support.h
@@ -93,7 +93,7 @@ struct pollfd {
#define POLLNVAL 0x1000 /* invalid file descriptor */
-extern int poll(struct pollfd *fds, nfds_t numfds, int timeout);
+int poll(struct pollfd *fds, nfds_t numfds, int timeout);
#endif /* HAVE_POLL_H */
#endif /* CONFIG_FFSERVER */
#endif /* CONFIG_NETWORK */