mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avformat/cafenc: use av_dict_iterate
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
fcbdd145cd
commit
401508b24b
@ -113,7 +113,7 @@ static int caf_write_header(AVFormatContext *s)
|
|||||||
AVIOContext *pb = s->pb;
|
AVIOContext *pb = s->pb;
|
||||||
AVCodecParameters *par = s->streams[0]->codecpar;
|
AVCodecParameters *par = s->streams[0]->codecpar;
|
||||||
CAFContext *caf = s->priv_data;
|
CAFContext *caf = s->priv_data;
|
||||||
AVDictionaryEntry *t = NULL;
|
const AVDictionaryEntry *t = NULL;
|
||||||
unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, par->codec_id);
|
unsigned int codec_tag = ff_codec_get_tag(ff_codec_caf_tags, par->codec_id);
|
||||||
int64_t chunk_size = 0;
|
int64_t chunk_size = 0;
|
||||||
int frame_size = par->frame_size, sample_rate = par->sample_rate;
|
int frame_size = par->frame_size, sample_rate = par->sample_rate;
|
||||||
@ -195,13 +195,13 @@ static int caf_write_header(AVFormatContext *s)
|
|||||||
ff_standardize_creation_time(s);
|
ff_standardize_creation_time(s);
|
||||||
if (av_dict_count(s->metadata)) {
|
if (av_dict_count(s->metadata)) {
|
||||||
ffio_wfourcc(pb, "info"); //< Information chunk
|
ffio_wfourcc(pb, "info"); //< Information chunk
|
||||||
while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) {
|
while ((t = av_dict_iterate(s->metadata, t))) {
|
||||||
chunk_size += strlen(t->key) + strlen(t->value) + 2;
|
chunk_size += strlen(t->key) + strlen(t->value) + 2;
|
||||||
}
|
}
|
||||||
avio_wb64(pb, chunk_size + 4);
|
avio_wb64(pb, chunk_size + 4);
|
||||||
avio_wb32(pb, av_dict_count(s->metadata));
|
avio_wb32(pb, av_dict_count(s->metadata));
|
||||||
t = NULL;
|
t = NULL;
|
||||||
while ((t = av_dict_get(s->metadata, "", t, AV_DICT_IGNORE_SUFFIX))) {
|
while ((t = av_dict_iterate(s->metadata, t))) {
|
||||||
avio_put_str(pb, t->key);
|
avio_put_str(pb, t->key);
|
||||||
avio_put_str(pb, t->value);
|
avio_put_str(pb, t->value);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user