diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-08-04 00:50:21 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-08-09 01:31:37 +0100 |
| commit | 7a851153d3fe1a9e0d60bf11053870d1ea8241e6 (patch) | |
| tree | 633e3e5107933dca6e4ecb051e988441aad982af /libavcodec/mpegvideo_enc.c | |
| parent | 18bbca1fd31360b6d21710db70d321fa0333e7a5 (diff) | |
| download | ffmpeg-streaming-7a851153d3fe1a9e0d60bf11053870d1ea8241e6.zip ffmpeg-streaming-7a851153d3fe1a9e0d60bf11053870d1ea8241e6.tar.gz | |
mpegvideo: convert mpegvideo_common.h to a .c file
This file defines a single, huge function, MPV_motion(), which
although being declared inline is not actually inlined by the
compiler (for good reason). There is thus no sense in defining
this function in a header file, resulting in multiple copies of
it in the final library.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index e84b0da..d527ace 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -33,7 +33,6 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" -#include "mpegvideo_common.h" #include "h263.h" #include "mjpegenc.h" #include "msmpeg4.h" @@ -1850,14 +1849,16 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, } if (s->mv_dir & MV_DIR_FORWARD) { - MPV_motion(s, dest_y, dest_cb, dest_cr, 0, s->last_picture.f.data, - op_pix, op_qpix); + ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 0, + s->last_picture.f.data, + op_pix, op_qpix); op_pix = s->dsp.avg_pixels_tab; op_qpix = s->dsp.avg_qpel_pixels_tab; } if (s->mv_dir & MV_DIR_BACKWARD) { - MPV_motion(s, dest_y, dest_cb, dest_cr, 1, s->next_picture.f.data, - op_pix, op_qpix); + ff_MPV_motion(s, dest_y, dest_cb, dest_cr, 1, + s->next_picture.f.data, + op_pix, op_qpix); } if (s->flags & CODEC_FLAG_INTERLACED_DCT) { |
