| Message ID | 20170327075203.7499-8-u@pkh.me |
|---|---|
| State | Accepted |
| Commit | d3cedc54cc872a376851828c88103c653fc8c395 |
| Headers | show |
On Mon, Mar 27, 2017 at 09:52:01AM +0200, Clément Bœsch wrote: > --- > libavformat/ape.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/libavformat/ape.c b/libavformat/ape.c > index 50a1aa13c1..c06db78480 100644 > --- a/libavformat/ape.c > +++ b/libavformat/ape.c > @@ -57,7 +57,6 @@ typedef struct APEContext { > APEFrame *frames; > > /* Info from Descriptor Block */ > - char magic[4]; > int16_t fileversion; > int16_t padding1; > uint32_t descriptorlength; > @@ -102,7 +101,6 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx) > int i; > > av_log(s, AV_LOG_DEBUG, "Descriptor Block:\n\n"); > - av_log(s, AV_LOG_DEBUG, "magic = \"%c%c%c%c\"\n", ape_ctx->magic[0], ape_ctx->magic[1], ape_ctx->magic[2], ape_ctx->magic[3]); > av_log(s, AV_LOG_DEBUG, "fileversion = %"PRId16"\n", ape_ctx->fileversion); > av_log(s, AV_LOG_DEBUG, "descriptorlength = %"PRIu32"\n", ape_ctx->descriptorlength); > av_log(s, AV_LOG_DEBUG, "headerlength = %"PRIu32"\n", ape_ctx->headerlength); ok unless someone wants this to be fixed the other way around and the field be printed [...]
diff --git a/libavformat/ape.c b/libavformat/ape.c index 50a1aa13c1..c06db78480 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -57,7 +57,6 @@ typedef struct APEContext { APEFrame *frames; /* Info from Descriptor Block */ - char magic[4]; int16_t fileversion; int16_t padding1; uint32_t descriptorlength; @@ -102,7 +101,6 @@ static void ape_dumpinfo(AVFormatContext * s, APEContext * ape_ctx) int i; av_log(s, AV_LOG_DEBUG, "Descriptor Block:\n\n"); - av_log(s, AV_LOG_DEBUG, "magic = \"%c%c%c%c\"\n", ape_ctx->magic[0], ape_ctx->magic[1], ape_ctx->magic[2], ape_ctx->magic[3]); av_log(s, AV_LOG_DEBUG, "fileversion = %"PRId16"\n", ape_ctx->fileversion); av_log(s, AV_LOG_DEBUG, "descriptorlength = %"PRIu32"\n", ape_ctx->descriptorlength); av_log(s, AV_LOG_DEBUG, "headerlength = %"PRIu32"\n", ape_ctx->headerlength);