mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
mpeg4 pts fix
Originally committed as revision 2724 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e40f5d3c6f
commit
11a8a71d4e
@ -2187,8 +2187,10 @@ static void mpeg4_encode_gop_header(MpegEncContext * s){
|
|||||||
put_bits(&s->pb, 1, 1);
|
put_bits(&s->pb, 1, 1);
|
||||||
put_bits(&s->pb, 6, seconds);
|
put_bits(&s->pb, 6, seconds);
|
||||||
|
|
||||||
put_bits(&s->pb, 1, 0); //closed gov == NO
|
put_bits(&s->pb, 1, !!(s->flags&CODEC_FLAG_CLOSED_GOP));
|
||||||
put_bits(&s->pb, 1, 0); //broken link == NO
|
put_bits(&s->pb, 1, 0); //broken link == NO
|
||||||
|
|
||||||
|
s->last_time_base= s->time_base;
|
||||||
|
|
||||||
ff_mpeg4_stuffing(&s->pb);
|
ff_mpeg4_stuffing(&s->pb);
|
||||||
}
|
}
|
||||||
|
@ -795,6 +795,14 @@ int MPV_encode_init(AVCodecContext *avctx)
|
|||||||
av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet\n");
|
av_log(avctx, AV_LOG_ERROR, "closed gop with scene change detection arent supported yet\n");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
i= ff_gcd(avctx->frame_rate, avctx->frame_rate_base);
|
||||||
|
if(i > 1){
|
||||||
|
av_log(avctx, AV_LOG_INFO, "removing common factors from framerate\n");
|
||||||
|
avctx->frame_rate /= i;
|
||||||
|
avctx->frame_rate_base /= i;
|
||||||
|
// return -1;
|
||||||
|
}
|
||||||
|
|
||||||
if(s->codec_id==CODEC_ID_MJPEG){
|
if(s->codec_id==CODEC_ID_MJPEG){
|
||||||
s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
|
s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
|
||||||
|
Loading…
Reference in New Issue
Block a user