virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avformat/apetag: reorder some code to improve readability

Browse Source 
This way it's clear the size field accounts for the footer length plus every
tag entry, but not the header.

Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-02-10 16:01:37 -03:00
parent 84d874a680
commit 33ab1d4c6f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/apetag.c
View File

@ -192,10 +192,6 @@ int ff_ape_write_tag(AVFormatContext *s)
if ((ret = avio_open_dyn_buf(&dyn_bc)) < 0)
goto end;
// flags
avio_wl32(dyn_bc, APE_TAG_FLAG_CONTAINS_HEADER | APE_TAG_FLAG_IS_HEADER);
ffio_fill(dyn_bc, 0, 8); // reserved
ff_standardize_creation_time(s);
while ((e = av_dict_get(s->metadata, "", e, AV_DICT_IGNORE_SUFFIX))) {
int val_len;
@ -218,7 +214,7 @@ int ff_ape_write_tag(AVFormatContext *s)
size = avio_close_dyn_buf(dyn_bc, &dyn_buf);
if (size <= 0)
goto end;
size += 20;
size += APE_TAG_FOOTER_BYTES;
// header
avio_write(s->pb, "APETAGEX", 8); // id
@ -226,7 +222,11 @@ int ff_ape_write_tag(AVFormatContext *s)
avio_wl32(s->pb, size);
avio_wl32(s->pb, count);
avio_write(s->pb, dyn_buf, size - 20);
// flags
avio_wl32(s->pb, APE_TAG_FLAG_CONTAINS_HEADER | APE_TAG_FLAG_IS_HEADER);
ffio_fill(s->pb, 0, 8); // reserved
avio_write(s->pb, dyn_buf, size - APE_TAG_FOOTER_BYTES);
// footer
avio_write(s->pb, "APETAGEX", 8); // id