diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 03:34:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:10:10 +0200 |
| commit | 8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5 (patch) | |
| tree | 2bc0615cc0d4a8ad47932dae2be2b6c3c1a82f9e /libavcodec/motion_est.c | |
| parent | 40d552dae657d2d690a724c8b1e7ea714998d74f (diff) | |
| parent | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (diff) | |
| download | ffmpeg-streaming-8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5.zip ffmpeg-streaming-8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5.tar.gz | |
Merge commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25'
* commit '6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25':
lavc: Replace av_dlog and tprintf with internal macros
Conflicts:
libavcodec/aacdec.c
libavcodec/audio_frame_queue.c
libavcodec/bitstream.c
libavcodec/dcadec.c
libavcodec/dnxhddec.c
libavcodec/dvbsubdec.c
libavcodec/dvdec.c
libavcodec/dvdsubdec.c
libavcodec/get_bits.h
libavcodec/gifdec.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/imc.c
libavcodec/interplayvideo.c
libavcodec/jpeglsdec.c
libavcodec/libopencore-amr.c
libavcodec/mjpegdec.c
libavcodec/mpeg12dec.c
libavcodec/mpegvideo_enc.c
libavcodec/mpegvideo_parser.c
libavcodec/pngdec.c
libavcodec/ratecontrol.c
libavcodec/rv10.c
libavcodec/svq1dec.c
libavcodec/vqavideo.c
libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/motion_est.c')
| -rw-r--r-- | libavcodec/motion_est.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index a0a5965..7e16880 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -32,6 +32,7 @@ #include <limits.h> #include "avcodec.h" +#include "internal.h" #include "mathops.h" #include "mpegutils.h" #include "mpegvideo.h" @@ -1546,11 +1547,11 @@ void ff_estimate_b_frame_motion(MpegEncContext * s, c->skip=0; bmin = estimate_motion_b(s, mb_x, mb_y, s->b_back_mv_table, 2, s->b_code) + 2 * penalty_factor; - av_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]); + ff_dlog(s, " %d %d ", s->b_forw_mv_table[xy][0], s->b_forw_mv_table[xy][1]); c->skip=0; fbmin= bidir_refine(s, mb_x, mb_y) + penalty_factor; - av_dlog(s, "%d %d %d %d\n", dmin, fmin, bmin, fbmin); + ff_dlog(s, "%d %d %d %d\n", dmin, fmin, bmin, fbmin); if(s->flags & CODEC_FLAG_INTERLACED_ME){ //FIXME mb type penalty |
