generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "lavf: deprecate get_strz() in favor of avio_get_str"

Browse Source 
This API is simply ridiculous.
We of course keep API/ABI compatibility only useage of the worse API
is reverted.

This reverts commit 773947ba76c575abc01ba128206c87440dad40ec.
This commit is contained in:
Michael Niedermayer 2011-03-06 02:10:26 +01:00
parent b09e506820
commit 4118d66cb3
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/cafdec.c
View File

@ -185,8 +185,8 @@ static void read_info_chunk(AVFormatContext *s, int64_t size)
for (i = 0; i < nb_entries; i++) { for (i = 0; i < nb_entries; i++) {
char key[32]; char key[32];
char value[1024]; char value[1024];
avio_get_str(pb, INT_MAX, key, sizeof(key)); get_strz(pb, key, sizeof(key));
avio_get_str(pb, INT_MAX, value, sizeof(value)); get_strz(pb, value, sizeof(value));
av_metadata_set2(&s->metadata, key, value, 0); av_metadata_set2(&s->metadata, key, value, 0);
} }
} }

3
libavformat/ffmdec.c
View File

@ -325,8 +325,7 @@ 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);
avio_get_str(pb, INT_MAX, rc_eq_buf, sizeof(rc_eq_buf)); codec->rc_eq = av_strdup(get_strz(pb, 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);

2
libavformat/mov.c
View File

@ -2331,7 +2331,7 @@ static void mov_read_chapters(AVFormatContext *s)
avio_get_str16le(sc->pb, len, title, title_len); avio_get_str16le(sc->pb, len, title, title_len);
else { else {
AV_WB16(title, ch); 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); ff_new_chapter(s, i, st->time_base, sample->timestamp, end, title);