Browse Source

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>
tags/n0.10
Paul B Mahol Michael Niedermayer 13 years ago
parent
commit
6813450209
2 changed files with 3 additions and 2 deletions
  1. +2
    -1
      libavformat/ffmdec.c
  2. +1
    -1
      libavformat/mov.c

+ 2
- 1
libavformat/ffmdec.c View File

@@ -325,7 +325,8 @@ static int ffm_read_header(AVFormatContext *s, AVFormatParameters *ap)
codec->qcompress = avio_rb16(pb) / 10000.0; codec->qcompress = avio_rb16(pb) / 10000.0;
codec->qblur = avio_rb16(pb) / 10000.0; codec->qblur = avio_rb16(pb) / 10000.0;
codec->bit_rate_tolerance = avio_rb32(pb); 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_max_rate = avio_rb32(pb);
codec->rc_min_rate = avio_rb32(pb); codec->rc_min_rate = avio_rb32(pb);
codec->rc_buffer_size = avio_rb32(pb); codec->rc_buffer_size = avio_rb32(pb);


+ 1
- 1
libavformat/mov.c View File

@@ -2619,7 +2619,7 @@ static void mov_read_chapters(AVFormatContext *s)
if (len == 1 || len == 2) if (len == 1 || len == 2)
title[len] = 0; title[len] = 0;
else else
get_strz(sc->pb, title + 2, len - 1);
avio_get_str(sc->pb, INT_MAX, title + 2, len - 1);
} }
} }




Loading…
Cancel
Save