# HG changeset patch # User michael # Date 1076705988 0 # Node ID 3f26dfb3eba470feabe9a1c50158970ed243d9e4 # Parent e039d79185c2e8cd9f0b8f8c616978fdceb0613e replace a few pbBufPtr() by put_bits_count(), one of them was actually wrong diff -r e039d79185c2 -r 3f26dfb3eba4 mpegvideo.c --- a/mpegvideo.c Fri Feb 13 18:39:43 2004 +0000 +++ b/mpegvideo.c Fri Feb 13 20:59:48 2004 +0000 @@ -2041,7 +2041,7 @@ } flush_put_bits(&s->pb); - s->frame_bits = (pbBufPtr(&s->pb) - s->pb.buf) * 8; + s->frame_bits = put_bits_count(&s->pb); stuffing_count= ff_vbv_update(s, s->frame_bits); if(stuffing_count){ @@ -2064,7 +2064,7 @@ av_log(s->avctx, AV_LOG_ERROR, "vbv buffer overflow\n"); } flush_put_bits(&s->pb); - s->frame_bits = (pbBufPtr(&s->pb) - s->pb.buf) * 8; + s->frame_bits = put_bits_count(&s->pb); } /* update mpeg1/2 vbv_delay for CBR */ @@ -4040,7 +4040,7 @@ if(s->rtp_mode){ int current_packet_size, is_gob_start; - current_packet_size= pbBufPtr(&s->pb) - s->ptr_lastgob; //FIXME wrong + current_packet_size= ((put_bits_count(&s->pb)+7)>>3) - (s->ptr_lastgob - s->pb.buf); is_gob_start= s->avctx->rtp_payload_size && current_packet_size >= s->avctx->rtp_payload_size && mb_y + mb_x>0;