Mercurial > libavformat.hg
diff avformat.h @ 384:9479dac25620 libavformat
fix global name conflicts patch by ("Ronald S. Bultje" <R dot S dot Bultje at students dot uu dot nl>)
| author | michael |
|---|---|
| date | Sat, 13 Mar 2004 23:04:37 +0000 |
| parents | 37a29b5200d8 |
| children | e440fb884442 |
line wrap: on
line diff
--- a/avformat.h Sat Mar 13 21:02:26 2004 +0000 +++ b/avformat.h Sat Mar 13 23:04:37 2004 +0000 @@ -425,7 +425,7 @@ int amr_init(void); /* wav.c */ -int wav_init(void); +int ff_wav_init(void); /* raw.c */ int pcm_read_seek(AVFormatContext *s, @@ -442,7 +442,7 @@ int ogg_init(void); /* dv.c */ -int dv_init(void); +int ff_dv_init(void); /* ffm.c */ int ffm_init(void);