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/parser.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/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 59a3c7508b..406a65f90c 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -27,6 +27,7 @@ #include "libavutil/atomic.h" #include "libavutil/mem.h" +#include "internal.h" #include "parser.h" #include "internal.h" @@ -232,9 +233,9 @@ int ff_combine_frame(ParseContext *pc, int next, const uint8_t **buf, int *buf_size) { if (pc->overread) { - av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n", + ff_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index); - av_dlog(NULL, "%X %X %X %X\n", + ff_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]); } @@ -293,9 +294,9 @@ int ff_combine_frame(ParseContext *pc, int next, } if (pc->overread) { - av_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n", + ff_dlog(NULL, "overread %d, state:%X next:%d index:%d o_index:%d\n", pc->overread, pc->state, next, pc->index, pc->overread_index); - av_dlog(NULL, "%X %X %X %X\n", + ff_dlog(NULL, "%X %X %X %X\n", (*buf)[0], (*buf)[1], (*buf)[2], (*buf)[3]); } |