summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.c
diff options
context:
space:
mode:
authorLoren Merritt <lorenm@u.washington.edu>2006-04-28 23:16:42 +0000
committerLoren Merritt <lorenm@u.washington.edu>2006-04-28 23:16:42 +0000
commit0c2aaa882d124f05b7bf0a4a4abba3293f4d6d84 (patch)
tree12e25bab1e280b4eed96375f379d2a8c96f51722 /libavcodec/ffv1.c
parentd1c9b76287b66e718277dec1ead45ea3326950cc (diff)
memory leak.
Originally committed as revision 5331 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ffv1.c')
-rw-r--r--libavcodec/ffv1.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 36a85d9a42..c987d84f6f 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -688,7 +688,8 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
}
}
-static void common_end(FFV1Context *s){
+static int common_end(AVCodecContext *avctx){
+ FFV1Context *s = avctx->priv_data;
int i;
for(i=0; i<s->plane_count; i++){
@@ -696,13 +697,6 @@ static void common_end(FFV1Context *s){
av_freep(&p->state);
}
-}
-
-static int encode_end(AVCodecContext *avctx)
-{
- FFV1Context *s = avctx->priv_data;
-
- common_end(s);
return 0;
}
@@ -1018,7 +1012,7 @@ AVCodec ffv1_decoder = {
sizeof(FFV1Context),
decode_init,
NULL,
- NULL,
+ common_end,
decode_frame,
CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
NULL
@@ -1032,6 +1026,6 @@ AVCodec ffv1_encoder = {
sizeof(FFV1Context),
encode_init,
encode_frame,
- encode_end,
+ common_end,
};
#endif