aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-01-23 18:49:25 +0000
committerMichael Niedermayer <michaelni@gmx.at>2012-01-24 17:01:10 +0100
commit6813450209bab97c30e8b25a018cdc4c936b224a (patch)
tree995c3496032d2de498affc2d3918c514fa910ba3
parent1c910d2f112948bf0c0c309a2049a0e3cdd290e3 (diff)
downloadffmpeg-6813450209bab97c30e8b25a018cdc4c936b224a.tar.gz
lavf: replace remaining use of deprecated get_strz()
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/ffmdec.c3
-rw-r--r--libavformat/mov.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 2b7ae7ed35..4b8e939e66 100644
--- a/libavformat/ffmdec.c
+++ b/libavformat/ffmdec.c
@@ -325,7 +325,8 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->qcompress = avio_rb16(pb) / 10000.0;
codec->qblur = avio_rb16(pb) / 10000.0;
codec->bit_rate_tolerance = avio_rb32(pb);
- codec->rc_eq = av_strdup(get_strz(pb, rc_eq_buf, sizeof(rc_eq_buf)));
+ avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf));
+ codec->rc_eq = av_strdup(rc_eq_buf);
codec->rc_max_rate = avio_rb32(pb);
codec->rc_min_rate = avio_rb32(pb);
codec->rc_buffer_size = avio_rb32(pb);
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3bb42fe3ed..06b2f87b0d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2619,7 +2619,7 @@ static void mov_read_chapters(AVFormatContext *s)
if (len == 1 || len == 2)
title[len] = 0;
else
- get_strz(sc->pb, title + 2, len - 1);
+ avio_get_str(sc->pb, INT_MAX, title + 2, len - 1);
}
}