diff mjpeg.c @ 1325:1cbc2380d172 libavcodec

CONFIG_ENCODERS cleanup
author michaelni
date Sun, 22 Jun 2003 11:08:22 +0000
parents f78341ab5fba
children 0fc1a6f8ca94
line wrap: on
line diff
--- a/mjpeg.c	Sat Jun 21 01:11:31 2003 +0000
+++ b/mjpeg.c	Sun Jun 22 11:08:22 2003 +0000
@@ -292,6 +292,7 @@
         case 7: ret= (left + top)>>1; break;\
     }
 
+#ifdef CONFIG_ENCODERS
 static inline void put_marker(PutBitContext *p, int code)
 {
     put_bits(p, 8, 0xff);
@@ -575,7 +576,7 @@
             mant--;
         }
         
-        nbits= av_log2(val) + 1;
+        nbits= av_log2_16bit(val) + 1;
             
         put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
         
@@ -789,6 +790,7 @@
 //    return (get_bit_count(&f->pb)+7)/8;
 }
 
+#endif //CONFIG_ENCODERS
 
 /******************************************/
 /* decoding */
@@ -2038,6 +2040,7 @@
     NULL
 };
 
+#ifdef CONFIG_ENCODERS
 AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them
     "ljpeg",
     CODEC_TYPE_VIDEO,
@@ -2047,3 +2050,4 @@
     encode_picture_lossless,
     MPV_encode_end,
 };
+#endif