diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
| commit | b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e (patch) | |
| tree | f502064c04d45369a01aa2722ac173b80301b8d3 /libavcodec/msmpeg4.c | |
| parent | f11d3f23105f8c7e195990ab2c1728d3dd2f206f (diff) | |
| download | ffmpeg-b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e.tar.gz | |
reversing header game
MIN/MAX -> FFMIN/FFMAX
Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/msmpeg4.c')
| -rw-r--r-- | libavcodec/msmpeg4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 81dc91fbb4..f1746b4f6d 100644 --- a/libavcodec/msmpeg4.c +++ b/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; |