diff avcodec.h @ 1422:efeed6e29f9b libavcodec

oooooops, having 2 Eterms open and doing cvs diff in one and cvs commit in the other sucks, especially if they are in different directories (MPlayer/main/libavcodec vs. ffmpeg/libavcodec)
author michaelni
date Mon, 25 Aug 2003 22:54:53 +0000
parents 340c90faa1dc
children 2e590fee59bd
line wrap: on
line diff
--- a/avcodec.h	Mon Aug 25 22:47:32 2003 +0000
+++ b/avcodec.h	Mon Aug 25 22:54:53 2003 +0000
@@ -220,7 +220,6 @@
 #define CODEC_CAP_PARSE_ONLY      0x0004
 #define CODEC_CAP_TRUNCATED       0x0008
 
-
 #define FF_COMMON_FRAME \
     /**\
      * pointer to the picture planes.\
@@ -464,7 +463,7 @@
      *                    do something for a generic case as well.
      * - decoding: set by lavc.
      */
-    enum PixelFormat pix_fmt; //FIXME move to AVFrme
+    enum PixelFormat pix_fmt;
  
     /**
      * Frame rate emulation. If not zero lower layer (i.e. format handler) 
@@ -712,7 +711,7 @@
                        data is returned. Only MPEG codecs support this now. */
     
     /**
-     * 0-> default, 1-> mpeg quant.
+     * 0-> h263 quant 1-> mpeg quant.
      * - encoding: set by user.
      * - decoding: unused
      */
@@ -1590,7 +1589,7 @@
 int avcodec(void* handle, avc_cmd_t cmd, void* pin, void* pout);
 
 /* memory */
-void *av_malloc(unsigned int size); //FIXME unsigned could be bad, dunno, need thinking
+void *av_malloc(unsigned int size);
 void *av_mallocz(unsigned int size);
 void *av_realloc(void *ptr, unsigned int size);
 void av_free(void *ptr);