[FFmpeg-soc] [soc]: r288 - in jpeg2000: j2k.h j2kenc.c

[k.nowosad]

Author: k.nowosad
Date: Sat Jun 30 16:19:15 2007
New Revision: 288

Log:
made two changes suggested by Michael Niedermayer and added one missing assignment


Modified:
   jpeg2000/j2k.h
   jpeg2000/j2kenc.c

Modified: jpeg2000/j2k.h
==============================================================================
--- jpeg2000/j2k.h	(original)
+++ jpeg2000/j2k.h	Sat Jun 30 16:19:15 2007
@@ -26,8 +26,8 @@
  * @author Kamil Nowosad
  */
 
-#ifndef _J2K_H_
-#define _J2K_H_
+#ifndef J2K_H
+#define J2K_H
 
 #include "aec.h"
 

Modified: jpeg2000/j2kenc.c
==============================================================================
--- jpeg2000/j2kenc.c	(original)
+++ jpeg2000/j2kenc.c	Sat Jun 30 16:19:15 2007
@@ -1032,7 +1032,7 @@ static void encode_tile(J2kEncoderContex
     av_log(s->avctx, AV_LOG_DEBUG, "after tier2\n");
 }
 
-void free(J2kEncoderContext *s)
+void cleanup(J2kEncoderContext *s)
 {
     int tileno, compno, reslevelno, bandno;
     for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++){
@@ -1063,6 +1063,7 @@ static int encode_frame(AVCodecContext *
     int tileno;
     J2kEncoderContext *s = avctx->priv_data;
 
+    s->avctx = avctx;
     av_log(s->avctx, AV_LOG_DEBUG, "start\n");
     s->picture = data;
 
@@ -1113,7 +1114,7 @@ static int encode_frame(AVCodecContext *
     }
     put_marker(s, J2K_EOC);
 
-    free(s);
+    cleanup(s);
     av_log(s->avctx, AV_LOG_DEBUG, "end\n");
     return s->buf - s->buf_start;
 }