diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-21 15:49:08 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2006-08-21 15:49:08 +0000 |
| commit | afbbe5e34f17a1efea93558b55de6d47187a8fb0 (patch) | |
| tree | 9d1abf204e1b576cb6505f887f2ca1f40f5ee726 /libavformat | |
| parent | 2b7e230b10f7acd35d508fa1b173b888e48aa4af (diff) | |
set correct first gop closed value
Originally committed as revision 6043 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/gxfenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/gxfenc.c b/libavformat/gxfenc.c index 979e95a65e..234e0a59c5 100644 --- a/libavformat/gxfenc.c +++ b/libavformat/gxfenc.c @@ -181,7 +181,7 @@ static int gxf_write_mpeg_auxiliary(ByteIOContext *pb, GXFStreamContext *ctx) size = snprintf(buffer, 1024, "Ver 1\nBr %.6f\nIpg 1\nPpi %d\nBpiop %d\n" "Pix 0\nCf %d\nCg %d\nSl 7\nnl16 %d\nVi 1\nf1 1\n", (float)ctx->codec->bit_rate, ctx->p_per_gop, ctx->b_per_gop, - ctx->codec->pix_fmt == PIX_FMT_YUV422P ? 2 : 1, ctx->first_gop_closed, + ctx->codec->pix_fmt == PIX_FMT_YUV422P ? 2 : 1, ctx->first_gop_closed == 1, ctx->codec->height / 16); put_byte(pb, 0x4F); put_byte(pb, size + 1); @@ -418,7 +418,7 @@ static int gxf_write_umf_media_mpeg(ByteIOContext *pb, GXFStreamContext *stream) put_le32(pb, 2); else put_le32(pb, 1); /* default to 420 */ - put_le32(pb, stream->first_gop_closed); /* closed = 1, open = 0, unknown = 255 */ + put_le32(pb, stream->first_gop_closed == 1); /* closed = 1, open = 0, unknown = 255 */ put_le32(pb, 3); /* top = 1, bottom = 2, frame = 3, unknown = 0 */ put_le32(pb, 1); /* I picture per GOP */ put_le32(pb, stream->p_per_gop); @@ -625,6 +625,7 @@ static int gxf_write_header(AVFormatContext *s) sc->fields = 2; /* interlaced */ switch (sc->codec->codec_id) { case CODEC_ID_MPEG2VIDEO: + sc->first_gop_closed = -1; sc->track_type = 4; gxf->mpeg_tracks++; gxf->flags |= 0x00008000; @@ -692,7 +693,7 @@ static int gxf_parse_mpeg_frame(GXFStreamContext *sc, const uint8_t *buf, int si int i; for(i=0; i<size-4 && c!=0x100; i++){ c = (c<<8) + buf[i]; - if(c == 0x1B8) /* GOP start code */ + if(c == 0x1B8 && sc->first_gop_closed == -1) /* GOP start code */ sc->first_gop_closed= (buf[i+4]>>6)&1; } return (buf[i+1]>>3)&7; |