diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:09:38 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:09:38 +0200 |
commit | f5ee10c16ac00f022e2f29bac3f51509e2799e02 (patch) | |
tree | d26678af959764447de256eb69ae49cfc8592933 /libavcodec/wmv2.h | |
parent | f9dcf1690c7c74fb8f12183f6b60c22026d632dd (diff) | |
parent | 2f15846ad7ad57beb0bca99c624affa0facf284b (diff) |
Merge commit '2f15846ad7ad57beb0bca99c624affa0facf284b'
* commit '2f15846ad7ad57beb0bca99c624affa0facf284b':
mpegvideo: wmv2: Move function declarations
Conflicts:
libavcodec/wmv2.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmv2.h')
-rw-r--r-- | libavcodec/wmv2.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index 4fa5e9bcec..31593b8c38 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -56,6 +56,21 @@ typedef struct Wmv2Context { void ff_wmv2_common_init(Wmv2Context *w); +int ff_wmv2_decode_mb(MpegEncContext *s, int16_t block[6][64]); +int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number); +void ff_wmv2_encode_mb(MpegEncContext * s, int16_t block[6][64], + int motion_x, int motion_y); +int ff_wmv2_decode_picture_header(MpegEncContext * s); +int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s); +void ff_wmv2_add_mb(MpegEncContext *s, int16_t block[6][64], + uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr); + +void ff_mspel_motion(MpegEncContext *s, + uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr, + uint8_t **ref_picture, op_pixels_func (*pix_op)[4], + int motion_x, int motion_y, int h); + + static av_always_inline int wmv2_get_cbp_table_index(MpegEncContext *s, int cbp_index) { static const uint8_t map[3][3] = { |