comparison a64.c @ 6449:3a28e6827095 libavformat

Solving memory leak and initialization problem with prev_pkt / pkt.

6448:4775a49a6045

                    for(j = 0; j < frame_size; j++) put_byte(s->pb, 0);
                }
            }
            /* backup current packet for next turn */
            if(pkt->data) {
                av_new_packet(&c->prev_pkt, pkt->size);
                memcpy(c->prev_pkt.data, pkt->data, pkt->size);
            }
            c->prev_frame_count = frame_count;
            break;
        }
        default:

}

static int a64_write_trailer(struct AVFormatContext *s)
{
    A64MuxerContext *c = s->priv_data;
    AVPacket pkt;
    /* need to flush last packet? */
    if(c->interleaved) a64_write_packet(s, &pkt);
    return 0;
}

AVOutputFormat a64_muxer = {
    .name = "a64",

6449:3a28e6827095

                    for(j = 0; j < frame_size; j++) put_byte(s->pb, 0);
                }
            }
            /* backup current packet for next turn */
            if(pkt->data) {
                /* no backup packet yet? create one! */
                if(!c->prev_pkt.data) av_new_packet(&c->prev_pkt, pkt->size);
                /* we have a packet and data is big enough, reuse it */
                if(c->prev_pkt.data && c->prev_pkt.size >= pkt->size) {
                    memcpy(c->prev_pkt.data, pkt->data, pkt->size);
                    c->prev_pkt.size = pkt->size;
                } else {
                    av_log(avctx, AV_LOG_ERROR, "Too less memory for prev_pkt.\n");
                    return AVERROR(ENOMEM);
                }
            }
            c->prev_frame_count = frame_count;
            break;
        }
        default:

}

static int a64_write_trailer(struct AVFormatContext *s)
{
    A64MuxerContext *c = s->priv_data;
    AVPacket pkt = {0};
    /* need to flush last packet? */
    if(c->interleaved) a64_write_packet(s, &pkt);
    /* discard backed up packet */
    if(c->prev_pkt.data) av_destruct_packet(&c->prev_pkt);
    return 0;
}

AVOutputFormat a64_muxer = {
    .name = "a64",