diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 17:25:13 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-08 17:42:56 +0100 |
commit | a30f7918b52d076c55a42bef3a731165b354bf08 (patch) | |
tree | f659d43c5ff88425e8d2c740dfe191da87e5988c /libavcodec/mpegvideo.h | |
parent | f8a9cf77040e1b2ed83206269ead11aa30afb98d (diff) | |
parent | 0338c396987c82b41d322630ea9712fe5f9561d6 (diff) |
Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6'
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
dsputil: Split off H.263 bits into their own H263DSPContext
Conflicts:
configure
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 8ba13213c3..5c2607a060 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -33,6 +33,7 @@ #include "error_resilience.h" #include "get_bits.h" #include "h264chroma.h" +#include "h263dsp.h" #include "hpeldsp.h" #include "put_bits.h" #include "ratecontrol.h" @@ -396,6 +397,7 @@ typedef struct MpegEncContext { H264ChromaContext h264chroma; HpelDSPContext hdsp; VideoDSPContext vdsp; + H263DSPContext h263dsp; int f_code; ///< forward MV resolution int b_code; ///< backward MV resolution for B Frames (mpeg4) int16_t (*p_mv_table_base)[2]; @@ -924,7 +926,6 @@ void ff_mpeg1_encode_slice_header(MpegEncContext *s); extern const uint8_t ff_aic_dc_scale_table[32]; extern const uint8_t ff_h263_chroma_qscale_table[32]; -extern const uint8_t ff_h263_loop_filter_strength[32]; /* rv10.c */ void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); |