# HG changeset patch
# User bellard
# Date 1063058609 0
# Node ID 7c73537bc994c26a968c39274e1679fa43cd1dc0
# Parent  daa70b33fc44e18f97c191dd6df0cfab8bd464a7
changed my mind about CODEC_ID_MPEGVIDEO - CODEC_ID_MP3LAME is absolete

diff -r daa70b33fc44 -r 7c73537bc994 avcodec.h
--- a/avcodec.h	Mon Sep 08 21:05:43 2003 +0000
+++ b/avcodec.h	Mon Sep 08 22:03:29 2003 +0000
@@ -15,20 +15,20 @@
 
 #define LIBAVCODEC_VERSION_INT 0x000408
 #define LIBAVCODEC_VERSION     "0.4.8"
-#define LIBAVCODEC_BUILD       4677
-#define LIBAVCODEC_BUILD_STR   "4677"
+#define LIBAVCODEC_BUILD       4678
+#define LIBAVCODEC_BUILD_STR   "4678"
 
 #define LIBAVCODEC_IDENT	"FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR
 
 enum CodecID {
     CODEC_ID_NONE, 
     CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO,
+    CODEC_ID_MPEG2VIDEO, /* prefered ID for MPEG Video 1 or 2 decoding */
     CODEC_ID_MPEG2VIDEO_XVMC,
     CODEC_ID_H263,
     CODEC_ID_RV10,
     CODEC_ID_MP2,
-    CODEC_ID_MP3LAME,
+    CODEC_ID_MP3, /* prefered ID for MPEG Audio layer 1, 2 or3 decoding */
     CODEC_ID_VORBIS,
     CODEC_ID_AC3,
     CODEC_ID_MJPEG,
@@ -100,7 +100,9 @@
     CODEC_ID_INTERPLAY_DPCM,
     CODEC_ID_XAN_DPCM,
 };
-#define CODEC_ID_MPEGVIDEO CODEC_ID_MPEG1VIDEO
+
+/* CODEC_ID_MP3LAME is absolete */
+#define CODEC_ID_MP3LAME CODEC_ID_MP3
 
 enum CodecType {
     CODEC_TYPE_UNKNOWN = -1,