diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2004-01-22 19:48:28 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2004-01-22 19:48:28 +0000 |
| commit | 303e50e65b8b9dc66ef9929a5a638a16378da64c (patch) | |
| tree | 1c4844019a66159a182fa2b059d008deda908c59 /libavcodec/mpeg12.c | |
| parent | d398a27e0b98f2d575d4e69ce4974768dff9f7d8 (diff) | |
| download | ffmpeg-303e50e65b8b9dc66ef9929a5a638a16378da64c.tar.gz | |
closed gop support & flags2 as all bits in flags are used
and a few minor things i forgot to commit ...
Originally committed as revision 2718 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpeg12.c')
| -rw-r--r-- | libavcodec/mpeg12.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index f76e714525..3edad5b802 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -330,7 +330,7 @@ static void mpeg1_encode_sequence_header(MpegEncContext *s) put_bits(&s->pb, 1, 1); put_bits(&s->pb, 6, (uint32_t)((time_code / fps) % 60)); put_bits(&s->pb, 6, (uint32_t)((time_code % fps))); - put_bits(&s->pb, 1, 0); /* closed gop */ + put_bits(&s->pb, 1, !!(s->flags & CODEC_FLAG_CLOSED_GOP)); put_bits(&s->pb, 1, 0); /* broken link */ } } @@ -1706,6 +1706,7 @@ static int mpeg_decode_init(AVCodecContext *avctx) s->mpeg_enc_ctx.avctx= avctx; s->mpeg_enc_ctx.flags= avctx->flags; + s->mpeg_enc_ctx.flags2= avctx->flags2; common_init(&s->mpeg_enc_ctx); init_vlcs(); |