diff options
| author | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-27 22:51:16 +0100 |
|---|---|---|
| committer | Darren Salt <devspam@moreofthesa.me.uk> | 2013-09-27 22:51:16 +0100 |
| commit | faf759b603c694a968e343918e750fcfa19c3e1e (patch) | |
| tree | 7e33687a03ce68d78505486ca9f19911adea9bc1 /src/input | |
| parent | 6b3ab6fcfbeef4c604cfe5819ede30d60c620d3b (diff) | |
| parent | 1484cd98330543db0f70955cb8877aeab7f8f06f (diff) | |
| download | xine-lib-faf759b603c694a968e343918e750fcfa19c3e1e.tar.gz xine-lib-faf759b603c694a968e343918e750fcfa19c3e1e.tar.bz2 | |
Merge.
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/libreal/asmrp.c | 4 | ||||
| -rw-r--r-- | src/input/libreal/real.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/input/libreal/asmrp.c b/src/input/libreal/asmrp.c index 45730eb90..df4f37774 100644 --- a/src/input/libreal/asmrp.c +++ b/src/input/libreal/asmrp.c @@ -362,7 +362,7 @@ static void asmrp_get_sym (asmrp_t *p) { } -static int asmrp_find_id (asmrp_t *p, char *s) { +static int asmrp_find_id (asmrp_t *p, const char *s) { int i; @@ -374,7 +374,7 @@ static int asmrp_find_id (asmrp_t *p, char *s) { return -1; } -static int asmrp_set_id (asmrp_t *p, char *s, int v) { +static int asmrp_set_id (asmrp_t *p, const char *s, int v) { int i; diff --git a/src/input/libreal/real.c b/src/input/libreal/real.c index d5320abed..73f1ec3b3 100644 --- a/src/input/libreal/real.c +++ b/src/input/libreal/real.c @@ -538,7 +538,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_session, unsigned char **buffer) { rmff_pheader_t ph; int size; int flags1; +#ifdef LOG int unknown1; +#endif uint32_t ts; n=rtsp_read_data(rtsp_session, header, 8); @@ -572,7 +574,9 @@ int real_get_rdt_chunk(rtsp_t *rtsp_session, unsigned char **buffer) { flags1=header[4]; size-=9; } +#ifdef LOG unknown1=(header[5]<<16)+(header[6]<<8)+(header[7]); +#endif n=rtsp_read_data(rtsp_session, header, 6); if (n<6) return 0; ts=_X_BE_32(header); |