diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 14:04:46 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-08 14:04:46 +0400 |
commit | a0fb6083967afcd7f2c43ab3ff1e510912644daa (patch) | |
tree | c8c71575049cf763b9acc8b8cf91e026650f607a /libavformat/avio_internal.h | |
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/avio_internal.h')
-rw-r--r-- | libavformat/avio_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/avio_internal.h b/libavformat/avio_internal.h index 4f4a428a4c..e67ba73812 100644 --- a/libavformat/avio_internal.h +++ b/libavformat/avio_internal.h @@ -52,7 +52,7 @@ int ffio_init_context(AVIOContext *s, * will be a copy of buf * @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. |