Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / msmpeg4enc.c

diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c
index 527d2840e1dc6ada9b31079818e330c0102348ba..db9eaabfa7dddc9ad869eccdd753f79d0536ca02 100644 (file)
--- a/libavcodec/msmpeg4enc.c
+++ b/libavcodec/msmpeg4enc.c
@@ -275,7 +275,8 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number)
 
 void ff_msmpeg4_encode_ext_header(MpegEncContext * s)
 {
-        put_bits(&s->pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); //yes 29.97 -> 29
+        unsigned fps = s->avctx->time_base.den / s->avctx->time_base.num / FFMAX(s->avctx->ticks_per_frame, 1);
+        put_bits(&s->pb, 5, FFMIN(fps, 31)); //yes 29.97 -> 29
 
         put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047));