diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-12-09 00:29:17 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-12-09 00:29:17 +0000 |
| commit | 4e00e76b3cf20eff69d8c86a5376bf0a12d3f6d4 (patch) | |
| tree | 8f4cf8a21ce9cee926c5d9eb411b09f3e8b11362 /libavcodec/avcodec.h | |
| parent | f8af5cb5a40c7fb76760ecfe03556845a83fbfe6 (diff) | |
| download | ffmpeg-streaming-4e00e76b3cf20eff69d8c86a5376bf0a12d3f6d4.zip ffmpeg-streaming-4e00e76b3cf20eff69d8c86a5376bf0a12d3f6d4.tar.gz | |
cleanup / messup?
fixes 20% speedloss bug
removes redundant variables from MpegEncContext
release buffers in avcodec_flush_buffers() (untested)
Originally committed as revision 1325 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 0dd560e..d02c3e7 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -5,8 +5,8 @@ #define LIBAVCODEC_VERSION_INT 0x000406 #define LIBAVCODEC_VERSION "0.4.6" -#define LIBAVCODEC_BUILD 4643 -#define LIBAVCODEC_BUILD_STR "4643" +#define LIBAVCODEC_BUILD 4644 +#define LIBAVCODEC_BUILD_STR "4644" enum CodecID { CODEC_ID_NONE, @@ -119,7 +119,7 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, ME_X1, ME_EPZS, ME_FULL }; -#define FF_MAX_B_FRAMES 4 +#define FF_MAX_B_FRAMES 8 /* encoding support these flags can be passed in AVCodecContext.flags before initing @@ -260,6 +260,19 @@ static const int Motion_Est_QTab[] = { ME_ZERO, ME_PHODS, ME_LOG, * decoding: unused\ */\ uint64_t error[4];\ +\ + /**\ + * type of the buffer (to keep track of who has to dealloc data[*])\ + * encoding: set by the one who allocs it\ + * decoding: set by the one who allocs it\ + * Note: user allocated (direct rendering) & internal buffers can not coexist currently\ + */\ + int type;\ + +#define FF_BUFFER_TYPE_INTERNAL 1 +#define FF_BUFFER_TYPE_USER 2 // Direct rendering buffers +#define FF_BUFFER_TYPE_SHARED 4 // input frame for encoding(wont be dealloced) + #define FF_I_TYPE 1 // Intra #define FF_P_TYPE 2 // Predicted |
