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/aviobuf.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/aviobuf.c')
| -rw-r--r-- | libavformat/aviobuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c index 466f3908b5..3707fda8bf 100644 --- a/libavformat/aviobuf.c +++ b/libavformat/aviobuf.c @@ -525,7 +525,7 @@ int avio_read(AVIOContext *s, unsigned char *buf, int 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) { *data = s->buf_ptr; |