diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:17:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-01 01:17:26 +0200 |
| commit | eb5a308d0e75120425c926b25b7141e2e8ea49bd (patch) | |
| tree | a701800a5fed3463b483ad0a8de2fb7945d06912 | |
| parent | f5ee10c16ac00f022e2f29bac3f51509e2799e02 (diff) | |
| parent | 31a117a0e6d6eafdf997bfe0843f3e3d39cc0332 (diff) | |
| download | ffmpeg-eb5a308d0e75120425c926b25b7141e2e8ea49bd.tar.gz | |
Merge commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332'
* commit '31a117a0e6d6eafdf997bfe0843f3e3d39cc0332':
mpegvideo: msmpeg4: Move function declarations
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/mpegvideo.h | 12 | ||||
| -rw-r--r-- | libavcodec/msmpeg4.h | 11 | ||||
| -rw-r--r-- | libavcodec/mss2.c | 1 | ||||
| -rw-r--r-- | libavcodec/vc1dec.c | 1 |
4 files changed, 13 insertions, 12 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 44e60ad36d..ec4a3b994f 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -880,18 +880,6 @@ int ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); int ff_rv_decode_dc(MpegEncContext *s, int n); void ff_rv20_encode_picture_header(MpegEncContext *s, int picture_number); - -/* msmpeg4.c */ -void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number); -void ff_msmpeg4_encode_ext_header(MpegEncContext * s); -void ff_msmpeg4_encode_mb(MpegEncContext * s, - int16_t block[6][64], - int motion_x, int motion_y); -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_mpeg_ref_picture(AVCodecContext *avctx, Picture *dst, Picture *src); void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *picture); void ff_free_picture_tables(Picture *pic); diff --git a/libavcodec/msmpeg4.h b/libavcodec/msmpeg4.h index ac07762002..bcdb967401 100644 --- a/libavcodec/msmpeg4.h +++ b/libavcodec/msmpeg4.h @@ -49,12 +49,23 @@ void ff_msmpeg4_handle_slices(MpegEncContext *s); void ff_msmpeg4_encode_motion(MpegEncContext * s, int mx, int my); int ff_msmpeg4_coded_block_pred(MpegEncContext * s, int n, uint8_t **coded_block_ptr); + +int ff_msmpeg4_encode_init(MpegEncContext *s); +void ff_msmpeg4_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_msmpeg4_encode_ext_header(MpegEncContext *s); +void ff_msmpeg4_encode_mb(MpegEncContext *s, int16_t block[6][64], + int motion_x, int motion_y); + +int ff_msmpeg4_decode_init(AVCodecContext *avctx); +int ff_msmpeg4_decode_picture_header(MpegEncContext *s); +int ff_msmpeg4_decode_ext_header(MpegEncContext *s, int buf_size); int ff_msmpeg4_decode_motion(MpegEncContext * s, int *mx_ptr, int *my_ptr); int ff_msmpeg4_decode_block(MpegEncContext * s, int16_t * block, int n, int coded, const uint8_t *scan_table); int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, int16_t **dc_val_ptr, int *dir_ptr); + #define CONFIG_MSMPEG4_DECODER (CONFIG_MSMPEG4V1_DECODER || \ CONFIG_MSMPEG4V2_DECODER || \ CONFIG_MSMPEG4V3_DECODER || \ diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 5e56e4dbb2..f57685d7b1 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -27,6 +27,7 @@ #include "error_resilience.h" #include "internal.h" #include "mpeg_er.h" +#include "msmpeg4.h" #include "msmpeg4data.h" #include "qpeldsp.h" #include "vc1.h" diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 0db7d02e5c..3fa39a579e 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -32,6 +32,7 @@ #include "internal.h" #include "mpeg_er.h" #include "mpegvideo.h" +#include "msmpeg4.h" #include "msmpeg4data.h" #include "vc1.h" #include "vc1data.h" |