diff options
| author | Juanjo <pulento@users.sourceforge.net> | 2002-05-06 19:32:55 +0000 |
|---|---|---|
| committer | Juanjo <pulento@users.sourceforge.net> | 2002-05-06 19:32:55 +0000 |
| commit | bc6caae212b8a5be9e78625b77ef8cc270b4a443 (patch) | |
| tree | 92bf8450d201eb989411e389952440e432b6f799 /libavcodec | |
| parent | afa90da5fb4715fcc974f34feab3a90400925845 (diff) | |
| download | ffmpeg-bc6caae212b8a5be9e78625b77ef8cc270b4a443.tar.gz | |
- MPEG-4 B frames coding option for ffmpeg.c
- Warning fixes.
Originally committed as revision 448 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/mpeg12.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 074b27c2b2..ba711f7627 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -75,7 +75,8 @@ enum Motion_Est_ID { extern int motion_estimation_method; /* ME algos sorted by quality */ -static const int Motion_Est_QTab[] = { 1, 4, 3, 6, 5, 2 }; +static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, + ME_X1, ME_EPZS, ME_FULL }; #define FF_MAX_B_FRAMES 4 diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 4ba235cca0..65cba431f8 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -33,7 +33,7 @@ #define EXT_START_CODE 0x000001b5 #define USER_START_CODE 0x000001b2 -#define ABS(a) ((a)<0 ? -(a) : (a)) +//#define ABS(a) ((a)<0 ? -(a) : (a)) static void mpeg1_encode_block(MpegEncContext *s, DCTELEM *block, |