repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.0~trusty1.1
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
ffmetadec.c
diff --git
a/ffmpeg/libavformat/ffmetadec.c
b/ffmpeg/libavformat/ffmetadec.c
index e4e9dda1dd1ca82ec9e66604457096e7a067d4db..e226406932cd121175ee2f67b67a48afea0a8564 100644
(file)
--- a/
ffmpeg/libavformat/ffmetadec.c
+++ b/
ffmpeg/libavformat/ffmetadec.c
@@
-78,10
+78,11
@@
static AVChapter *read_chapter(AVFormatContext *s)
return avpriv_new_chapter(s, s->nb_chapters, tb, start, end, NULL);
}
return avpriv_new_chapter(s, s->nb_chapters, tb, start, end, NULL);
}
-static uint8_t *unescape(uint8_t *buf, int size)
+static uint8_t *unescape(
const
uint8_t *buf, int size)
{
uint8_t *ret = av_malloc(size + 1);
{
uint8_t *ret = av_malloc(size + 1);
- uint8_t *p1 = ret, *p2 = buf;
+ uint8_t *p1 = ret;
+ const uint8_t *p2 = buf;
if (!ret)
return NULL;
if (!ret)
return NULL;
@@
-95,9
+96,10
@@
static uint8_t *unescape(uint8_t *buf, int size)
return ret;
}
return ret;
}
-static int read_tag(uint8_t *line, AVDictionary **m)
+static int read_tag(
const
uint8_t *line, AVDictionary **m)
{
{
- uint8_t *key, *value, *p = line;
+ uint8_t *key, *value;
+ const uint8_t *p = line;
/* find first not escaped '=' */
while (1) {
/* find first not escaped '=' */
while (1) {