virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

Merge commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0'

Browse Source 
* commit '5afe1d27912be9b643ffb4ddc21f6d920260dbb0':
  avio: Add const qualifiers to ffio_read_indirect

Conflicts:
	libavformat/mpegts.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-08 12:04:46 +02:00
commit a0fb608396
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/avio_internal.h
View File

@ -52,7 +52,7 @@ int ffio_init_context(AVIOContext *s,
* will be a copy of buf * will be a copy of buf
* @return number of bytes read or AVERROR * @return number of bytes read or AVERROR
*/ */
int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, unsigned char **data); int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data);
/** /**
* Read size bytes from AVIOContext into buf. * Read size bytes from AVIOContext into buf.

2
libavformat/aviobuf.c
View File

@ -525,7 +525,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int size)
return size1 - size; return size1 - size;
} }
int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, unsigned char **data) int ffio_read_indirect(AVIOContext *s, unsigned char *buf, int size, const unsigned char **data)
{ {
if (s->buf_end - s->buf_ptr >= size && !s->write_flag) { if (s->buf_end - s->buf_ptr >= size && !s->write_flag) {
*data = s->buf_ptr; *data = s->buf_ptr;

8
libavformat/mpegts.c
View File

@ -1923,7 +1923,7 @@ static int mpegts_resync(AVFormatContext *s)
} }
/* return -1 if error or EOF. Return 0 if OK. */ /* 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; AVIOContext *pb = s->pb;
int len; int len;
@ -1959,7 +1959,7 @@ static int handle_packets(MpegTSContext *ts, int nb_packets)
{ {
AVFormatContext *s = ts->stream; AVFormatContext *s = ts->stream;
uint8_t packet[TS_PACKET_SIZE + FF_INPUT_BUFFER_PADDING_SIZE]; uint8_t packet[TS_PACKET_SIZE + FF_INPUT_BUFFER_PADDING_SIZE];
uint8_t *data; const uint8_t *data;
int packet_num, ret = 0; int packet_num, ret = 0;
if (avio_tell(s->pb) != ts->last_pos) { 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; int64_t pcrs[2], pcr_h;
int packet_count[2]; int packet_count[2];
uint8_t packet[TS_PACKET_SIZE]; uint8_t packet[TS_PACKET_SIZE];
uint8_t *data; const uint8_t *data;
/* only read packets */ /* only read packets */
@ -2183,7 +2183,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s,
int64_t pcr_h, next_pcr_h, pos; int64_t pcr_h, next_pcr_h, pos;
int pcr_l, next_pcr_l; int pcr_l, next_pcr_l;
uint8_t pcr_buf[12]; uint8_t pcr_buf[12];
uint8_t *data; const uint8_t *data;
if (av_new_packet(pkt, TS_PACKET_SIZE) < 0) if (av_new_packet(pkt, TS_PACKET_SIZE) < 0)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);