diff options
| author | Michael Hunold <devnull@localhost> | 2002-12-23 14:17:57 +0000 |
|---|---|---|
| committer | Michael Hunold <devnull@localhost> | 2002-12-23 14:17:57 +0000 |
| commit | 18668795699dd3d92b5bb1565103918fa0e4e2e6 (patch) | |
| tree | a5a8dad447b69a777d04f57eb81407dcc3411504 | |
| parent | 5ba2551f2573daac61b1cbe612d6fb1cd6384095 (diff) | |
| download | mediapointer-dvb-s2-18668795699dd3d92b5bb1565103918fa0e4e2e6.tar.gz mediapointer-dvb-s2-18668795699dd3d92b5bb1565103918fa0e4e2e6.tar.bz2 | |
Official patch for "get_ac3_info()" by Holger.
(applied by me because he's already at home...)
| -rw-r--r-- | linux/drivers/media/dvb/av7110/av7110_ipack.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_filter.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_filter.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_ksyms.c | 4 |
4 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/dvb/av7110/av7110_ipack.c b/linux/drivers/media/dvb/av7110/av7110_ipack.c index 7058839ad..3d16442e6 100644 --- a/linux/drivers/media/dvb/av7110/av7110_ipack.c +++ b/linux/drivers/media/dvb/av7110/av7110_ipack.c @@ -64,7 +64,7 @@ void send_ipack(ipack *p) ac3_off = ((p->buf[off+2] << 8)| p->buf[off+3]); if (ac3_off < p->count) - f=get_ac3info(p->buf+off+3+ac3_off, + f=dvb_filter_get_ac3info(p->buf+off+3+ac3_off, p->count-ac3_off, &ai,0); if ( !f ){ nframes = (p->count-off-3-ac3_off)/ diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.c b/linux/drivers/media/dvb/dvb-core/dvb_filter.c index dd22acc6c..46a679dde 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_filter.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.c @@ -347,7 +347,7 @@ int get_ainfo(uint8_t *mbuf, int count, AudioInfo *ai, int pr) #endif -int get_ac3info(uint8_t *mbuf, int count, AudioInfo *ai, int pr) +int dvb_filter_get_ac3info(uint8_t *mbuf, int count, AudioInfo *ai, int pr) { uint8_t *headr; int found = 0; diff --git a/linux/drivers/media/dvb/dvb-core/dvb_filter.h b/linux/drivers/media/dvb/dvb-core/dvb_filter.h index ad21ba45e..082c65601 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_filter.h +++ b/linux/drivers/media/dvb/dvb-core/dvb_filter.h @@ -224,7 +224,7 @@ typedef struct audio_i{ uint32_t off; } AudioInfo; -int get_ac3info(uint8_t *mbuf, int count, AudioInfo *ai, int pr); +int dvb_filter_get_ac3info(uint8_t *mbuf, int count, AudioInfo *ai, int pr); #endif diff --git a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c index 3296fe708..76c035885 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_ksyms.c @@ -41,7 +41,5 @@ EXPORT_SYMBOL(dvb_generic_release); EXPORT_SYMBOL(dvb_filter_pes2ts_init); EXPORT_SYMBOL(dvb_filter_pes2ts); +EXPORT_SYMBOL(dvb_filter_get_ac3info); -/* FIXME: this is needed/referenced by av7110, but does not - have a dvb_* prefix */ -EXPORT_SYMBOL(get_ac3info); |