comparison mjpegenc.c @ 7260:3ec34b551aae libavcodec

bitstream: move put_sbits() from flacenc.c to bitstream.h and use it throughout libavcodec.
author ramiro
date Sun, 13 Jul 2008 14:27:48 +0000
parents 7a73d76aaaa0
children 04423b2f6e0b
comparison
equal deleted inserted replaced
7259:9de4bc7d4938 7260:3ec34b551aae
367 367
368 nbits= av_log2_16bit(val) + 1; 368 nbits= av_log2_16bit(val) + 1;
369 369
370 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]); 370 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
371 371
372 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); 372 put_sbits(&s->pb, nbits, mant);
373 } 373 }
374 } 374 }
375 375
376 static void encode_block(MpegEncContext *s, DCTELEM *block, int n) 376 static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
377 { 377 {
419 nbits= av_log2(val) + 1; 419 nbits= av_log2(val) + 1;
420 code = (run << 4) | nbits; 420 code = (run << 4) | nbits;
421 421
422 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]); 422 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
423 423
424 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1)); 424 put_sbits(&s->pb, nbits, mant);
425 run = 0; 425 run = 0;
426 } 426 }
427 } 427 }
428 428
429 /* output EOB only if not already 64 values */ 429 /* output EOB only if not already 64 values */