diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2010-05-16 15:12:23 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2010-05-16 15:12:23 +0000 |
commit | 26230ae04859f277a6d6ee0d7e603c0788ca7136 (patch) | |
tree | 868a32442462145fce9cd92b46e51e3ddad78d72 /apps/plugins/mpegplayer/mpeg_parser.c | |
parent | 53a858b36c7c31e72ad28ae06721258ea4cdd039 (diff) | |
download | rockbox-26230ae04859f277a6d6ee0d7e603c0788ca7136.tar.gz rockbox-26230ae04859f277a6d6ee0d7e603c0788ca7136.zip |
MPEGPlayer: reconceal the point puns
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26090 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/mpegplayer/mpeg_parser.c')
-rw-r--r-- | apps/plugins/mpegplayer/mpeg_parser.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/plugins/mpegplayer/mpeg_parser.c b/apps/plugins/mpegplayer/mpeg_parser.c index f21292abd5..06fa01c2e9 100644 --- a/apps/plugins/mpegplayer/mpeg_parser.c +++ b/apps/plugins/mpegplayer/mpeg_parser.c | |||
@@ -99,7 +99,7 @@ uint8_t * mpeg_parser_scan_start_code(struct stream_scan *sk, uint32_t code) | |||
99 | { | 99 | { |
100 | uint8_t *p; | 100 | uint8_t *p; |
101 | off_t pos = disk_buf_lseek(sk->pos, SEEK_SET); | 101 | off_t pos = disk_buf_lseek(sk->pos, SEEK_SET); |
102 | ssize_t len = disk_buf_getbuffer_l2(&sk->l2, 4, (void **)&p); | 102 | ssize_t len = disk_buf_getbuffer_l2(&sk->l2, 4, &p); |
103 | 103 | ||
104 | if (pos < 0 || len < 4) | 104 | if (pos < 0 || len < 4) |
105 | break; | 105 | break; |
@@ -131,7 +131,7 @@ unsigned mpeg_parser_scan_pes(struct stream_scan *sk) | |||
131 | { | 131 | { |
132 | uint8_t *p; | 132 | uint8_t *p; |
133 | off_t pos = disk_buf_lseek(sk->pos, SEEK_SET); | 133 | off_t pos = disk_buf_lseek(sk->pos, SEEK_SET); |
134 | ssize_t len = disk_buf_getbuffer_l2(&sk->l2, 4, (void **)&p); | 134 | ssize_t len = disk_buf_getbuffer_l2(&sk->l2, 4, &p); |
135 | 135 | ||
136 | if (pos < 0 || len < 4) | 136 | if (pos < 0 || len < 4) |
137 | break; | 137 | break; |
@@ -192,7 +192,7 @@ uint32_t mpeg_parser_scan_pts(struct stream_scan *sk, unsigned id) | |||
192 | { | 192 | { |
193 | uint8_t *p; | 193 | uint8_t *p; |
194 | off_t pos = disk_buf_lseek(sk->pos, SEEK_SET); | 194 | off_t pos = disk_buf_lseek(sk->pos, SEEK_SET); |
195 | ssize_t len = disk_buf_getbuffer_l2(&sk->l2, 30, (void **)&p); | 195 | ssize_t len = disk_buf_getbuffer_l2(&sk->l2, 30, &p); |
196 | 196 | ||
197 | if (pos < 0 || len < 4) | 197 | if (pos < 0 || len < 4) |
198 | break; | 198 | break; |
@@ -742,7 +742,7 @@ static int parse_demux(struct stream *str, enum stream_parse_mode type) | |||
742 | str->hdr.pos = disk_buf_lseek(str->hdr.pos, SEEK_SET); | 742 | str->hdr.pos = disk_buf_lseek(str->hdr.pos, SEEK_SET); |
743 | 743 | ||
744 | if (str->hdr.pos < 0 || str->hdr.pos >= str->hdr.limit || | 744 | if (str->hdr.pos < 0 || str->hdr.pos >= str->hdr.limit || |
745 | disk_buf_getbuffer(MIN_BUFAHEAD, (void **)&p, NULL, NULL) <= 0) | 745 | disk_buf_getbuffer(MIN_BUFAHEAD, &p, NULL, NULL) <= 0) |
746 | { | 746 | { |
747 | str_end_of_stream(str); | 747 | str_end_of_stream(str); |
748 | return STREAM_DATA_END; | 748 | return STREAM_DATA_END; |
@@ -1017,7 +1017,7 @@ static int parse_elementary(struct stream *str, enum stream_parse_mode type) | |||
1017 | 1017 | ||
1018 | case STREAM_PM_RANDOM_ACCESS: | 1018 | case STREAM_PM_RANDOM_ACCESS: |
1019 | str->hdr.pos = disk_buf_lseek(str->hdr.pos, SEEK_SET); | 1019 | str->hdr.pos = disk_buf_lseek(str->hdr.pos, SEEK_SET); |
1020 | len = disk_buf_getbuffer(DISK_BUF_PAGE_SIZE, (void **)&p, NULL, NULL); | 1020 | len = disk_buf_getbuffer(DISK_BUF_PAGE_SIZE, &p, NULL, NULL); |
1021 | 1021 | ||
1022 | if (len <= 0 || str->hdr.pos < 0 || str->hdr.pos >= str->hdr.limit) | 1022 | if (len <= 0 || str->hdr.pos < 0 || str->hdr.pos >= str->hdr.limit) |
1023 | { | 1023 | { |