comparison mpeg12enc.c @ 7143:8e25ae9f1c4a libavcodec

Support >=4096 dimensions, fixes issue499.
author michael
date Wed, 25 Jun 2008 23:57:06 +0000
parents e943e1409077
children 3ec34b551aae
comparison
equal deleted inserted replaced
7142:60c3177894fe 7143:8e25ae9f1c4a
204 AVRational framerate= ff_frame_rate_tab[s->frame_rate_index]; 204 AVRational framerate= ff_frame_rate_tab[s->frame_rate_index];
205 205
206 /* mpeg1 header repeated every gop */ 206 /* mpeg1 header repeated every gop */
207 put_header(s, SEQ_START_CODE); 207 put_header(s, SEQ_START_CODE);
208 208
209 put_bits(&s->pb, 12, s->width); 209 put_bits(&s->pb, 12, s->width & 0xFFF);
210 put_bits(&s->pb, 12, s->height); 210 put_bits(&s->pb, 12, s->height & 0xFFF);
211 211
212 for(i=1; i<15; i++){ 212 for(i=1; i<15; i++){
213 float error= aspect_ratio; 213 float error= aspect_ratio;
214 if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1) 214 if(s->codec_id == CODEC_ID_MPEG1VIDEO || i <=1)
215 error-= 1.0/ff_mpeg1_aspect[i]; 215 error-= 1.0/ff_mpeg1_aspect[i];
270 put_bits(&s->pb, 3, s->avctx->profile); //profile 270 put_bits(&s->pb, 3, s->avctx->profile); //profile
271 put_bits(&s->pb, 4, s->avctx->level); //level 271 put_bits(&s->pb, 4, s->avctx->level); //level
272 272
273 put_bits(&s->pb, 1, s->progressive_sequence); 273 put_bits(&s->pb, 1, s->progressive_sequence);
274 put_bits(&s->pb, 2, s->chroma_format); 274 put_bits(&s->pb, 2, s->chroma_format);
275 put_bits(&s->pb, 2, 0); //horizontal size ext 275 put_bits(&s->pb, 2, s->width >>12);
276 put_bits(&s->pb, 2, 0); //vertical size ext 276 put_bits(&s->pb, 2, s->height>>12);
277 put_bits(&s->pb, 12, v>>18); //bitrate ext 277 put_bits(&s->pb, 12, v>>18); //bitrate ext
278 put_bits(&s->pb, 1, 1); //marker 278 put_bits(&s->pb, 1, 1); //marker
279 put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext 279 put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext
280 put_bits(&s->pb, 1, s->low_delay); 280 put_bits(&s->pb, 1, s->low_delay);
281 put_bits(&s->pb, 2, 0); // frame_rate_ext_n 281 put_bits(&s->pb, 2, 0); // frame_rate_ext_n