From 810ddddbc0d5f6587b9154115fa60d546d728310 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 11 Nov 2002 13:45:34 +0000 Subject: sync ffmpeg - add wma decoder - fix mmx macro - remove changes from fdct_mmx.c (it should work fine now with the mmx macro fix) CVS patchset: 3234 CVS date: 2002/11/11 13:45:34 --- src/libffmpeg/libavcodec/msmpeg4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libffmpeg/libavcodec/msmpeg4.c') diff --git a/src/libffmpeg/libavcodec/msmpeg4.c b/src/libffmpeg/libavcodec/msmpeg4.c index 81dc91fbb..f1746b4f6 100644 --- a/src/libffmpeg/libavcodec/msmpeg4.c +++ b/src/libffmpeg/libavcodec/msmpeg4.c @@ -425,7 +425,7 @@ void msmpeg4_encode_ext_header(MpegEncContext * s) { put_bits(&s->pb, 5, s->frame_rate / FRAME_RATE_BASE); //yes 29.97 -> 29 - put_bits(&s->pb, 11, MIN(s->bit_rate/1024, 2047)); + put_bits(&s->pb, 11, FFMIN(s->bit_rate/1024, 2047)); if(s->msmpeg4_version<3) s->flipflop_rounding=0; -- cgit v1.2.3