summaryrefslogtreecommitdiff
path: root/src/libffmpeg/libavcodec/mpegvideo.h
diff options
context:
space:
mode:
authorGuenter Bartsch <guenter@users.sourceforge.net>2001-08-28 19:16:19 +0000
committerGuenter Bartsch <guenter@users.sourceforge.net>2001-08-28 19:16:19 +0000
commit6bea16fb8408d80701ba329edfb3cd7ae5b880af (patch)
tree7ce8e55d2b61bdabf088c9317dfa8f2623ca1903 /src/libffmpeg/libavcodec/mpegvideo.h
parentad2464b4ef019dcfe299d52325490a342b3e6d1b (diff)
downloadxine-lib-6bea16fb8408d80701ba329edfb3cd7ae5b880af.tar.gz
xine-lib-6bea16fb8408d80701ba329edfb3cd7ae5b880af.tar.bz2
update to ffmpeg 0.4.5, buf types cleanup based on patch provided by Miguel Freitas
CVS patchset: 510 CVS date: 2001/08/28 19:16:19
Diffstat (limited to 'src/libffmpeg/libavcodec/mpegvideo.h')
-rw-r--r--src/libffmpeg/libavcodec/mpegvideo.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libffmpeg/libavcodec/mpegvideo.h b/src/libffmpeg/libavcodec/mpegvideo.h
index a225dedbe..dccdeb24b 100644
--- a/src/libffmpeg/libavcodec/mpegvideo.h
+++ b/src/libffmpeg/libavcodec/mpegvideo.h
@@ -31,6 +31,7 @@ enum OutputFormat {
#define MPEG_BUF_SIZE (16 * 1024)
typedef struct MpegEncContext {
+ struct AVCodecContext *avctx;
/* the following parameters must be initialized before encoding */
int width, height; /* picture size. must be a multiple of 16 */
int gop_size;
@@ -40,7 +41,7 @@ typedef struct MpegEncContext {
enum OutputFormat out_format; /* output format */
int h263_plus; /* h263 plus headers */
int h263_rv10; /* use RV10 variation for H263 */
- int h263_pred; /* use OpenDIVX (aka mpeg4) ac/dc predictions */
+ int h263_pred; /* use mpeg4/h263 ac/dc predictions */
int h263_msmpeg4; /* generate MSMPEG4 compatible stream */
int h263_intel; /* use I263 intel h263 header */
int fixed_qscale; /* fixed qscale if non zero */
@@ -125,11 +126,14 @@ typedef struct MpegEncContext {
/* bit rate control */
int I_frame_bits; /* wanted number of bits per I frame */
int P_frame_bits; /* same for P frame */
- long long wanted_bits;
- long long total_bits;
+ INT64 wanted_bits;
+ INT64 total_bits;
/* mpeg4 specific */
int time_increment_bits;
+ int shape;
+ int vol_sprite_usage;
+ int quant_precision;
/* RV10 specific */
int rv10_version; /* RV10 version: 0 or 3 */