Mercurial > libavformat.hg
changeset 1124:d3aff2c607f9 libavformat
Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org
| author | diego |
|---|---|
| date | Sun, 18 Jun 2006 11:33:14 +0000 |
| parents | 6992dd78ff68 |
| children | 6380964c7623 |
| files | aiff.c movenc.c mpegts.c mpegtsenc.c rtsp.c udp.c |
| diffstat | 6 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/aiff.c Sat Jun 17 15:53:23 2006 +0000 +++ b/aiff.c Sun Jun 18 11:33:14 2006 +0000 @@ -110,7 +110,7 @@ } /* Returns the number of sound data frames or negative on error */ -unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec, +static unsigned int get_aiff_header(ByteIOContext *pb, AVCodecContext *codec, int size, unsigned version) { AVExtFloat ext;
--- a/movenc.c Sat Jun 17 15:53:23 2006 +0000 +++ b/movenc.c Sun Jun 18 11:33:14 2006 +0000 @@ -1341,7 +1341,7 @@ return updateSize(pb, pos); } -int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov) +static int mov_write_mdat_tag(ByteIOContext *pb, MOVContext* mov) { put_be32(pb, 8); // placeholder for extended size field (64 bit) put_tag(pb, "wide");
--- a/mpegts.c Sat Jun 17 15:53:23 2006 +0000 +++ b/mpegts.c Sun Jun 18 11:33:14 2006 +0000 @@ -151,7 +151,7 @@ } } -MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid, +static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid, SectionCallback *section_cb, void *opaque, int check_crc) @@ -183,7 +183,7 @@ return filter; } -MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid, +static MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid, PESCallback *pes_cb, void *opaque) { @@ -205,7 +205,7 @@ return filter; } -void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter) +static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter) { int pid; @@ -609,7 +609,7 @@ ts->pat_filter = NULL; } -void mpegts_set_service(MpegTSContext *ts, int sid, +static void mpegts_set_service(MpegTSContext *ts, int sid, SetServiceCallback *set_service_cb, void *opaque) { ts->set_service_cb = set_service_cb; @@ -696,7 +696,7 @@ } /* scan services in a transport stream by looking at the SDT */ -void mpegts_scan_sdt(MpegTSContext *ts) +static void mpegts_scan_sdt(MpegTSContext *ts) { ts->sdt_filter = mpegts_open_section_filter(ts, SDT_PID, sdt_cb, ts, 1); @@ -704,7 +704,7 @@ /* scan services in a transport stream by looking at the PAT (better than nothing !) */ -void mpegts_scan_pat(MpegTSContext *ts) +static void mpegts_scan_pat(MpegTSContext *ts) { ts->pat_filter = mpegts_open_section_filter(ts, PAT_PID, pat_scan_cb, ts, 1);
--- a/mpegtsenc.c Sat Jun 17 15:53:23 2006 +0000 +++ b/mpegtsenc.c Sun Jun 18 11:33:14 2006 +0000 @@ -34,7 +34,7 @@ } MpegTSSection; /* NOTE: 4 bytes must be left at the end for the crc32 */ -void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) +static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len) { unsigned int crc; unsigned char packet[TS_PACKET_SIZE]; @@ -89,7 +89,7 @@ *q_ptr = q; } -int mpegts_write_section1(MpegTSSection *s, int tid, int id, +static int mpegts_write_section1(MpegTSSection *s, int tid, int id, int version, int sec_num, int last_sec_num, uint8_t *buf, int len) {
--- a/rtsp.c Sat Jun 17 15:53:23 2006 +0000 +++ b/rtsp.c Sun Jun 18 11:33:14 2006 +0000 @@ -145,7 +145,7 @@ char buf[256]; int i; AVCodec *c; - char *c_name; + const char *c_name; /* Loop into AVRtpDynamicPayloadTypes[] and AVRtpPayloadTypes[] and see if we can handle this kind of payload */ @@ -169,7 +169,7 @@ c = avcodec_find_decoder(codec->codec_id); if (c && c->name) - c_name = (char *)c->name; + c_name = c->name; else c_name = (char *)NULL; @@ -255,7 +255,7 @@ typedef struct attrname_map { - char *str; + const char *str; uint16_t type; uint32_t offset; } attrname_map_t;
--- a/udp.c Sat Jun 17 15:53:23 2006 +0000 +++ b/udp.c Sun Jun 18 11:33:14 2006 +0000 @@ -51,7 +51,7 @@ #ifdef CONFIG_IPV6 -int udp_ipv6_is_multicast_address(const struct sockaddr *addr) { +static int udp_ipv6_is_multicast_address(const struct sockaddr *addr) { if (addr->sa_family == AF_INET) return IN_MULTICAST(ntohl(((struct sockaddr_in *)addr)->sin_addr.s_addr)); if (addr->sa_family == AF_INET6) @@ -59,7 +59,7 @@ return -1; } -int udp_ipv6_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr) { +static int udp_ipv6_set_multicast_ttl(int sockfd, int mcastTTL, struct sockaddr *addr) { if (addr->sa_family == AF_INET) { if (setsockopt(sockfd, IPPROTO_IP, IP_MULTICAST_TTL, &mcastTTL, sizeof(mcastTTL)) < 0) { perror("setsockopt(IP_MULTICAST_TTL)"); @@ -75,7 +75,7 @@ return 0; } -int udp_ipv6_join_multicast_group(int sockfd, struct sockaddr *addr) { +static int udp_ipv6_join_multicast_group(int sockfd, struct sockaddr *addr) { struct ip_mreq mreq; struct ipv6_mreq mreq6; if (addr->sa_family == AF_INET) { @@ -97,7 +97,7 @@ return 0; } -int udp_ipv6_leave_multicast_group(int sockfd, struct sockaddr *addr) { +static int udp_ipv6_leave_multicast_group(int sockfd, struct sockaddr *addr) { struct ip_mreq mreq; struct ipv6_mreq mreq6; if (addr->sa_family == AF_INET) { @@ -119,7 +119,7 @@ return 0; } -struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) { +static struct addrinfo* udp_ipv6_resolve_host(const char *hostname, int port, int type, int family, int flags) { struct addrinfo hints, *res = 0; int error; char sport[16]; @@ -144,7 +144,7 @@ return res; } -int udp_ipv6_set_remote_url(URLContext *h, const char *uri) { +static int udp_ipv6_set_remote_url(URLContext *h, const char *uri) { UDPContext *s = h->priv_data; char hostname[256]; int port; @@ -158,7 +158,7 @@ return 0; } -int udp_ipv6_set_local(URLContext *h) { +static int udp_ipv6_set_local(URLContext *h) { UDPContext *s = h->priv_data; int udp_fd = -1; struct sockaddr_storage clientaddr;