From 45fc24a005c170b3fea1c028a49fdb6be61875bd Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Fri, 16 Oct 2009 15:16:59 +0000 Subject: [PATCH] Do not try to free memory that was never allocated (partial revert of r20231). Originally committed as revision 20252 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/indeo2.c | 1 - libavcodec/loco.c | 1 - libavcodec/qdrw.c | 1 - libavcodec/truemotion2.c | 1 - libavcodec/ulti.c | 1 - libavcodec/wnv1.c | 1 - libavcodec/xl.c | 1 - 7 files changed, 7 deletions(-) diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 87d1c909ea..52aede19fe 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -219,7 +219,6 @@ static av_cold int ir2_decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&ic->picture); return 0; } diff --git a/libavcodec/loco.c b/libavcodec/loco.c index 9a01810c44..57fba82cf0 100644 --- a/libavcodec/loco.c +++ b/libavcodec/loco.c @@ -281,7 +281,6 @@ static av_cold int decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&l->pic); return 0; } diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index ae8a71a8a1..f0c0350c23 100644 --- a/libavcodec/qdrw.c +++ b/libavcodec/qdrw.c @@ -146,7 +146,6 @@ static av_cold int decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&a->pic); return 0; } diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index d73c88bd44..44b89e70d1 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -866,7 +866,6 @@ static av_cold int decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&l->pic); return 0; } diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index a5aec1a3a9..12dc6ac14f 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -61,7 +61,6 @@ static av_cold int ulti_decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&s->frame); return 0; } diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 9f13fd5b76..9a5a77fe78 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -149,7 +149,6 @@ static av_cold int decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&l->pic); return 0; } diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 277e92a678..2a5110cb98 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -134,7 +134,6 @@ static av_cold int decode_end(AVCodecContext *avctx){ if (pic->data[0]) avctx->release_buffer(avctx, pic); - av_freep(&a->pic); return 0; }