MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/icoenc: Simplify writing bitmask 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-09-22 21:52:24 +02:00
parent d94b641b4a
commit 7d5e27b473
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/icoenc.c
View File

@ -31,6 +31,7 @@
#include "libavcodec/codec_id.h"
#include "avformat.h"
#include "avio_internal.h"
typedef struct {
int offset;
@ -119,7 +120,6 @@ static int ico_write_packet(AVFormatContext *s, AVPacket *pkt)
IcoImage *image;
AVIOContext *pb = s->pb;
AVCodecParameters *par = s->streams[pkt->stream_index]->codecpar;
int i;
if (ico->current_image >= ico->nb_images) {
av_log(s, AV_LOG_ERROR, "ICO already contains %d images\n", ico->current_image);
@ -150,8 +150,8 @@ static int ico_write_packet(AVFormatContext *s, AVPacket *pkt)
avio_wl32(pb, AV_RL32(pkt->data + 22) * 2); // rewrite height as 2 * height
avio_write(pb, pkt->data + 26, pkt->size - 26);
for (i = 0; i < par->height * (par->width + 7) / 8; ++i)
avio_w8(pb, 0x00); // Write bitmask (opaque)
// Write bitmask (opaque)
ffio_fill(pb, 0x00, par->height * (par->width + 7) / 8);
}
return 0;