diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2003-06-22 11:08:22 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2003-06-22 11:08:22 +0000 |
| commit | 2a250222e6df9f13f871c934c96da32b4439e7b7 (patch) | |
| tree | 29bb96f76f201cee1ed658c3654b3016f4946d48 /libavcodec/mjpeg.c | |
| parent | 4fb518c392c0b30b17962e44bf29aa7080ce2b74 (diff) | |
| download | ffmpeg-2a250222e6df9f13f871c934c96da32b4439e7b7.tar.gz | |
CONFIG_ENCODERS cleanup
Originally committed as revision 1984 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mjpeg.c')
| -rw-r--r-- | libavcodec/mjpeg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c index 454238a4c2..f3f83a94d7 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/mjpeg.c @@ -292,6 +292,7 @@ void mjpeg_close(MpegEncContext *s) 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 @@ static inline void mjpeg_encode_dc(MpegEncContext *s, int val, 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 @@ static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, in // return (get_bit_count(&f->pb)+7)/8; } +#endif //CONFIG_ENCODERS /******************************************/ /* decoding */ @@ -2038,6 +2040,7 @@ AVCodec mjpegb_decoder = { NULL }; +#ifdef CONFIG_ENCODERS AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them "ljpeg", CODEC_TYPE_VIDEO, @@ -2047,3 +2050,4 @@ AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them encode_picture_lossless, MPV_encode_end, }; +#endif |