# HG changeset patch
# User pulento
# Date 1020713575 0
# Node ID abbed9f28d75fa3d4640c1db88c2f1332b6f6026
# Parent  94268ece131ec3df193635a6147d64bf5914b1ea
- MPEG-4 B frames coding option for ffmpeg.c
- Warning fixes.

diff -r 94268ece131e -r abbed9f28d75 avcodec.h
--- a/avcodec.h	Mon May 06 16:40:43 2002 +0000
+++ b/avcodec.h	Mon May 06 19:32:55 2002 +0000
@@ -75,7 +75,8 @@
 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 -r 94268ece131e -r abbed9f28d75 mpeg12.c
--- a/mpeg12.c	Mon May 06 16:40:43 2002 +0000
+++ b/mpeg12.c	Mon May 06 19:32:55 2002 +0000
@@ -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,