From 48d533e6fa3d386c82a018a181530d4c6a545d16 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 5 Mar 2008 15:19:26 +0000 Subject: [PATCH] define BI frame type along with other frame types Originally committed as revision 12336 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 1 + libavcodec/utils.c | 1 + libavcodec/vc1.h | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 32dd4da281..de94d8ed73 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -757,6 +757,7 @@ typedef struct AVPanScan{ #define FF_S_TYPE 4 // S(GMC)-VOP MPEG4 #define FF_SI_TYPE 5 #define FF_SP_TYPE 6 +#define FF_BI_TYPE 7 #define FF_BUFFER_HINTS_VALID 0x01 // Buffer hints value is meaningful (if 0 ignore). #define FF_BUFFER_HINTS_READABLE 0x02 // Codec will read from buffer. diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 26f776e890..4aaedb11c5 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1289,6 +1289,7 @@ char av_get_pict_type_char(int pict_type){ case FF_S_TYPE: return 'S'; case FF_SI_TYPE:return 'i'; case FF_SP_TYPE:return 'p'; + case FF_BI_TYPE:return 'b'; default: return '?'; } } diff --git a/libavcodec/vc1.h b/libavcodec/vc1.h index 12f38160bf..3e92d6c340 100644 --- a/libavcodec/vc1.h +++ b/libavcodec/vc1.h @@ -128,7 +128,7 @@ enum TransformTypes { //@} /** One more frame type */ -#define BI_TYPE 7 +#define BI_TYPE FF_BI_TYPE enum CodingSet { CS_HIGH_MOT_INTRA = 0,