[FFmpeg-cvslog] lavf: replace remaining use of deprecated get_strz()

Paul B Mahol git at videolan.org
Tue Jan 24 17:16:42 CET 2012


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Jan 23 18:49:25 2012 +0000| [6813450209bab97c30e8b25a018cdc4c936b224a] | committer: Michael Niedermayer

lavf: replace remaining use of deprecated get_strz()

Signed-off-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6813450209bab97c30e8b25a018cdc4c936b224a
---

 libavformat/ffmdec.c |    3 ++-
 libavformat/mov.c    |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c
index 2b7ae7e..4b8e939 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 3bb42fe..06b2f87 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);
             }
         }
 



More information about the ffmpeg-cvslog mailing list