diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-06 02:10:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-06 02:16:00 +0100 |
| commit | 4118d66cb39f96a227c2f90d325a73045afe091e (patch) | |
| tree | 9ed41facebf8cec3cce6b0d95cc1085dce5bdacb | |
| parent | b09e5068203bb9852734c04e37f852dd4d1d1137 (diff) | |
| download | ffmpeg-4118d66cb39f96a227c2f90d325a73045afe091e.tar.gz | |
Revert "lavf: deprecate get_strz() in favor of avio_get_str"
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.
This reverts commit 773947ba76c575abc01ba128206c87440dad40ec.
| -rw-r--r-- | libavformat/cafdec.c | 4 | ||||
| -rw-r--r-- | libavformat/ffmdec.c | 3 | ||||
| -rw-r--r-- | libavformat/mov.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index bc0a7760ea..96403d3b9e 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -185,8 +185,8 @@ static void read_info_chunk(AVFormatContext *s, int64_t size) for (i = 0; i < nb_entries; i++) { char key[32]; char value[1024]; - avio_get_str(pb, INT_MAX, key, sizeof(key)); - avio_get_str(pb, INT_MAX, value, sizeof(value)); + get_strz(pb, key, sizeof(key)); + get_strz(pb, value, sizeof(value)); av_metadata_set2(&s->metadata, key, value, 0); } } diff --git a/libavformat/ffmdec.c b/libavformat/ffmdec.c index 2977527b97..b956c75f86 100644 --- a/libavformat/ffmdec.c +++ b/libavformat/ffmdec.c @@ -325,8 +325,7 @@ 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); - avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf)); - codec->rc_eq = av_strdup(rc_eq_buf); + codec->rc_eq = av_strdup(get_strz(pb, rc_eq_buf, sizeof(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 e9435a93c6..be799a4fdc 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2331,7 +2331,7 @@ static void mov_read_chapters(AVFormatContext *s) avio_get_str16le(sc->pb, len, title, title_len); else { AV_WB16(title, ch); - avio_get_str(sc->pb, len - 2, title + 2, title_len - 2); + get_strz(sc->pb, title + 2, len - 1); } ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title); |