diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:04:46 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 12:04:46 +0200 |
commit | a0fb6083967afcd7f2c43ab3ff1e510912644daa (patch) | |
tree | c8c71575049cf763b9acc8b8cf91e026650f607a /libavformat/mpegts.c | |
parent | f09b5fb4afedb711b169a582b2c1b1c61e6653e0 (diff) | |
parent | 5afe1d27912be9b643ffb4ddc21f6d920260dbb0 (diff) |
Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'
* commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0':
avio: Add const qualifiers to ffio_read_indirect
Conflicts:
libavformat/mpegts.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpegts.c')
-rw-r--r-- | libavformat/mpegts.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 15a5d2fe6d..996348af92 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -1923,7 +1923,7 @@ static int mpegts_resync(AVFormatContext *s) } /* return -1 if error or EOF. Return 0 if OK. */ -static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size, uint8_t **data) +static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size, const uint8_t **data) { AVIOContext *pb = s->pb; int len; @@ -1959,7 +1959,7 @@ static int handle_packets(MpegTSContext *ts, int nb_packets) { AVFormatContext *s = ts->stream; uint8_t packet[TS_PACKET_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; - uint8_t *data; + const uint8_t *data; int packet_num, ret = 0; if (avio_tell(s->pb) != ts->last_pos) { @@ -2121,7 +2121,7 @@ static int mpegts_read_header(AVFormatContext *s) int64_t pcrs[2], pcr_h; int packet_count[2]; uint8_t packet[TS_PACKET_SIZE]; - uint8_t *data; + const uint8_t *data; /* only read packets */ @@ -2183,7 +2183,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s, int64_t pcr_h, next_pcr_h, pos; int pcr_l, next_pcr_l; uint8_t pcr_buf[12]; - uint8_t *data; + const uint8_t *data; if (av_new_packet(pkt, TS_PACKET_SIZE) < 0) return AVERROR(ENOMEM); |