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/mpegvideo.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/mpegvideo.h')
-rw-r--r-- | libavcodec/mpegvideo.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index a4370bab83..44e60ad36d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -891,17 +891,6 @@ int ff_msmpeg4_decode_picture_header(MpegEncContext * s); int ff_msmpeg4_decode_ext_header(MpegEncContext * s, int buf_size); int ff_msmpeg4_decode_init(AVCodecContext *avctx); int ff_msmpeg4_encode_init(MpegEncContext *s); -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); -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_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src); void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *picture); |