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/msmpeg4enc.c | |
| parent | 40d552dae657d2d690a724c8b1e7ea714998d74f (diff) | |
| parent | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (diff) | |
| download | ffmpeg-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/msmpeg4enc.c')
| -rw-r--r-- | libavcodec/msmpeg4enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/msmpeg4enc.c b/libavcodec/msmpeg4enc.c index d369147983..cd81c9486c 100644 --- a/libavcodec/msmpeg4enc.c +++ b/libavcodec/msmpeg4enc.c @@ -35,6 +35,7 @@ #include "libavutil/mem.h" #include "mpegvideo.h" #include "h263.h" +#include "internal.h" #include "mpeg4video.h" #include "msmpeg4.h" #include "msmpeg4data.h" @@ -239,7 +240,7 @@ void ff_msmpeg4_encode_picture_header(MpegEncContext * s, int picture_number) s->per_mb_rl_table = 0; if(s->msmpeg4_version==4) s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE && s->pict_type==AV_PICTURE_TYPE_P); - av_dlog(s, "%d %d %d %d %d\n", s->pict_type, s->bit_rate, + ff_dlog(s, "%d %d %d %d %d\n", s->pict_type, s->bit_rate, s->inter_intra_pred, s->width, s->height); if (s->pict_type == AV_PICTURE_TYPE_I) { |