Release frame after decoding is done

Originally committed as revision 20231 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Kostya Shishkov 15 years ago
parent ea09f69194
commit 6d924b5a5f
  1. 13
      libavcodec/indeo2.c
  2. 13
      libavcodec/loco.c
  3. 13
      libavcodec/qdrw.c
  4. 6
      libavcodec/truemotion2.c
  5. 13
      libavcodec/ulti.c
  6. 13
      libavcodec/wnv1.c
  7. 13
      libavcodec/xl.c

@ -213,6 +213,17 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static av_cold int ir2_decode_end(AVCodecContext *avctx){
Ir2Context * const ic = avctx->priv_data;
AVFrame *pic = &ic->picture;
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&ic->picture);
return 0;
}
AVCodec indeo2_decoder = { AVCodec indeo2_decoder = {
"indeo2", "indeo2",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
@ -220,7 +231,7 @@ AVCodec indeo2_decoder = {
sizeof(Ir2Context), sizeof(Ir2Context),
ir2_decode_init, ir2_decode_init,
NULL, NULL,
NULL, ir2_decode_end,
ir2_decode_frame, ir2_decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"), .long_name = NULL_IF_CONFIG_SMALL("Intel Indeo 2"),

@ -275,6 +275,17 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx){
LOCOContext * const l = avctx->priv_data;
AVFrame *pic = &l->pic;
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&l->pic);
return 0;
}
AVCodec loco_decoder = { AVCodec loco_decoder = {
"loco", "loco",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
@ -282,7 +293,7 @@ AVCodec loco_decoder = {
sizeof(LOCOContext), sizeof(LOCOContext),
decode_init, decode_init,
NULL, NULL,
NULL, decode_end,
decode_frame, decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("LOCO"), .long_name = NULL_IF_CONFIG_SMALL("LOCO"),

@ -140,6 +140,17 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx){
QdrawContext * const a = avctx->priv_data;
AVFrame *pic = &a->pic;
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&a->pic);
return 0;
}
AVCodec qdraw_decoder = { AVCodec qdraw_decoder = {
"qdraw", "qdraw",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
@ -147,7 +158,7 @@ AVCodec qdraw_decoder = {
sizeof(QdrawContext), sizeof(QdrawContext),
decode_init, decode_init,
NULL, NULL,
NULL, decode_end,
decode_frame, decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"), .long_name = NULL_IF_CONFIG_SMALL("Apple QuickDraw"),

@ -845,6 +845,7 @@ static av_cold int decode_init(AVCodecContext *avctx){
static av_cold int decode_end(AVCodecContext *avctx){ static av_cold int decode_end(AVCodecContext *avctx){
TM2Context * const l = avctx->priv_data; TM2Context * const l = avctx->priv_data;
AVFrame *pic = &l->pic;
int i; int i;
if(l->last) if(l->last)
@ -862,6 +863,11 @@ static av_cold int decode_end(AVCodecContext *avctx){
av_free(l->U2); av_free(l->U2);
av_free(l->V2); av_free(l->V2);
} }
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&l->pic);
return 0; return 0;
} }

@ -55,6 +55,17 @@ static av_cold int ulti_decode_init(AVCodecContext *avctx)
return 0; return 0;
} }
static av_cold int ulti_decode_end(AVCodecContext *avctx){
UltimotionDecodeContext *s = avctx->priv_data;
AVFrame *pic = &s->frame;
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&s->frame);
return 0;
}
static const int block_coords[8] = // 4x4 block coords in 8x8 superblock static const int block_coords[8] = // 4x4 block coords in 8x8 superblock
{ 0, 0, 0, 4, 4, 4, 4, 0}; { 0, 0, 0, 4, 4, 4, 4, 0};
@ -401,7 +412,7 @@ AVCodec ulti_decoder = {
sizeof(UltimotionDecodeContext), sizeof(UltimotionDecodeContext),
ulti_decode_init, ulti_decode_init,
NULL, NULL,
NULL, ulti_decode_end,
ulti_decode_frame, ulti_decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
NULL, NULL,

@ -143,6 +143,17 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx){
WNV1Context * const l = avctx->priv_data;
AVFrame *pic = &l->pic;
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&l->pic);
return 0;
}
AVCodec wnv1_decoder = { AVCodec wnv1_decoder = {
"wnv1", "wnv1",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
@ -150,7 +161,7 @@ AVCodec wnv1_decoder = {
sizeof(WNV1Context), sizeof(WNV1Context),
decode_init, decode_init,
NULL, NULL,
NULL, decode_end,
decode_frame, decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"), .long_name = NULL_IF_CONFIG_SMALL("Winnov WNV1"),

@ -128,6 +128,17 @@ static av_cold int decode_init(AVCodecContext *avctx){
return 0; return 0;
} }
static av_cold int decode_end(AVCodecContext *avctx){
VideoXLContext * const a = avctx->priv_data;
AVFrame *pic = &a->pic;
if (pic->data[0])
avctx->release_buffer(avctx, pic);
av_freep(&a->pic);
return 0;
}
AVCodec xl_decoder = { AVCodec xl_decoder = {
"xl", "xl",
CODEC_TYPE_VIDEO, CODEC_TYPE_VIDEO,
@ -135,7 +146,7 @@ AVCodec xl_decoder = {
sizeof(VideoXLContext), sizeof(VideoXLContext),
decode_init, decode_init,
NULL, NULL,
NULL, decode_end,
decode_frame, decode_frame,
CODEC_CAP_DR1, CODEC_CAP_DR1,
.long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"), .long_name = NULL_IF_CONFIG_SMALL("Miro VideoXL"),

Loading…
Cancel
Save