comparison mpeg12.c @ 1754:bdf3927bf8c5 libavcodec

closed gop support & flags2 as all bits in flags are used and a few minor things i forgot to commit ...
author michael
date Thu, 22 Jan 2004 19:48:28 +0000
parents 7b11032507e2
children b7340afa261a
comparison
equal deleted inserted replaced
1753:bbf583d24584 1754:bdf3927bf8c5
328 put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24)); 328 put_bits(&s->pb, 5, (uint32_t)((time_code / (fps * 3600)) % 24));
329 put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60)); 329 put_bits(&s->pb, 6, (uint32_t)((time_code / (fps * 60)) % 60));
330 put_bits(&s->pb, 1, 1); 330 put_bits(&s->pb, 1, 1);
331 put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60)); 331 put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60));
332 put_bits(&s->pb, 6, (uint32_t)((time_code % fps))); 332 put_bits(&s->pb, 6, (uint32_t)((time_code % fps)));
333 put_bits(&s->pb, 1, 0); /* closed gop */ 333 put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP));
334 put_bits(&s->pb, 1, 0); /* broken link */ 334 put_bits(&s->pb, 1, 0); /* broken link */
335 } 335 }
336 } 336 }
337 337
338 static inline void encode_mb_skip_run(MpegEncContext *s, int run){ 338 static inline void encode_mb_skip_run(MpegEncContext *s, int run){
1704 { 1704 {
1705 Mpeg1Context *s = avctx->priv_data; 1705 Mpeg1Context *s = avctx->priv_data;
1706 1706
1707 s->mpeg_enc_ctx.avctx= avctx; 1707 s->mpeg_enc_ctx.avctx= avctx;
1708 s->mpeg_enc_ctx.flags= avctx->flags; 1708 s->mpeg_enc_ctx.flags= avctx->flags;
1709 s->mpeg_enc_ctx.flags2= avctx->flags2;
1709 common_init(&s->mpeg_enc_ctx); 1710 common_init(&s->mpeg_enc_ctx);
1710 init_vlcs(); 1711 init_vlcs();
1711 1712
1712 s->mpeg_enc_ctx_allocated = 0; 1713 s->mpeg_enc_ctx_allocated = 0;
1713 s->mpeg_enc_ctx.picture_number = 0; 1714 s->mpeg_enc_ctx.picture_number = 0;