diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-11-11 13:45:34 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-11-11 13:45:34 +0000 |
| commit | 810ddddbc0d5f6587b9154115fa60d546d728310 (patch) | |
| tree | 67256930a6cd947fb3f09b070b19dedd4fbbcd10 /src/libffmpeg/libavcodec/msmpeg4.c | |
| parent | e38a8cca2c6be40954a44f167f7cc9fac0813ede (diff) | |
| download | xine-lib-810ddddbc0d5f6587b9154115fa60d546d728310.tar.gz xine-lib-810ddddbc0d5f6587b9154115fa60d546d728310.tar.bz2 | |
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
Diffstat (limited to 'src/libffmpeg/libavcodec/msmpeg4.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/msmpeg4.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |