Originally committed as revision 8047 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
| @@ -1952,8 +1952,8 @@ static inline int get_chroma_qp(int chroma_qp_index_offset, int qscale){ | |||||
| } | } | ||||
| //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close | //FIXME need to check that this doesnt overflow signed 32 bit for low qp, i am not sure, it's very close | ||||
| //FIXME check that gcc inlines this (and optimizes intra & seperate_dc stuff away) | |||||
| static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int seperate_dc){ | |||||
| //FIXME check that gcc inlines this (and optimizes intra & separate_dc stuff away) | |||||
| static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int intra, int separate_dc){ | |||||
| int i; | int i; | ||||
| const int * const quant_table= quant_coeff[qscale]; | const int * const quant_table= quant_coeff[qscale]; | ||||
| const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | const int bias= intra ? (1<<QUANT_SHIFT)/3 : (1<<QUANT_SHIFT)/6; | ||||
| @@ -1961,7 +1961,7 @@ static inline int quantize_c(DCTELEM *block, uint8_t *scantable, int qscale, int | |||||
| const unsigned int threshold2= (threshold1<<1); | const unsigned int threshold2= (threshold1<<1); | ||||
| int last_non_zero; | int last_non_zero; | ||||
| if(seperate_dc){ | |||||
| if(separate_dc){ | |||||
| if(qscale<=18){ | if(qscale<=18){ | ||||
| //avoid overflows | //avoid overflows | ||||
| const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | const int dc_bias= intra ? (1<<(QUANT_SHIFT-2))/3 : (1<<(QUANT_SHIFT-2))/6; | ||||
| @@ -159,7 +159,9 @@ static int oggvorbis_encode_frame(AVCodecContext *avccontext, | |||||
| vorbis_bitrate_addblock(&context->vb) ; | vorbis_bitrate_addblock(&context->vb) ; | ||||
| while(vorbis_bitrate_flushpacket(&context->vd, &op)) { | while(vorbis_bitrate_flushpacket(&context->vd, &op)) { | ||||
| if(op.bytes==1) //id love to say this is a hack, bad sadly its not, appearently the end of stream decission is in libogg | |||||
| /* i'd love to say the following line is a hack, but sadly it's | |||||
| * not, apparently the end of stream decision is in libogg. */ | |||||
| if(op.bytes==1) | |||||
| continue; | continue; | ||||
| memcpy(context->buffer + context->buffer_index, &op, sizeof(ogg_packet)); | memcpy(context->buffer + context->buffer_index, &op, sizeof(ogg_packet)); | ||||
| context->buffer_index += sizeof(ogg_packet); | context->buffer_index += sizeof(ogg_packet); | ||||
| @@ -220,7 +220,7 @@ static AVStream *add_video_stream(AVFormatContext *oc, int codec_id) | |||||
| motion of the chroma plane doesnt match the luma plane */ | motion of the chroma plane doesnt match the luma plane */ | ||||
| c->mb_decision=2; | c->mb_decision=2; | ||||
| } | } | ||||
| // some formats want stream headers to be seperate | |||||
| // some formats want stream headers to be separate | |||||
| if(!strcmp(oc->oformat->name, "mp4") || !strcmp(oc->oformat->name, "mov") || !strcmp(oc->oformat->name, "3gp")) | if(!strcmp(oc->oformat->name, "mp4") || !strcmp(oc->oformat->name, "mov") || !strcmp(oc->oformat->name, "3gp")) | ||||
| c->flags |= CODEC_FLAG_GLOBAL_HEADER; | c->flags |= CODEC_FLAG_GLOBAL_HEADER; | ||||