diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 04:34:22 +0300 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 05:10:10 +0300 |
commit | 8f7b022c8c2f40bf8ddfd90778a4c91424d3a8e5 (patch) | |
tree | 2bc0615cc0d4a8ad47932dae2be2b6c3c1a82f9e /libavcodec/svq1dec.c | |
parent | 40d552dae657d2d690a724c8b1e7ea714998d74f (diff) | |
parent | 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 (diff) |
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/svq1dec.c')
-rw-r--r-- | libavcodec/svq1dec.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/svq1dec.c b/libavcodec/svq1dec.c index f65915c475..6394647a0c 100644 --- a/libavcodec/svq1dec.c +++ b/libavcodec/svq1dec.c @@ -189,7 +189,7 @@ static int svq1_decode_block_intra(GetBitContext *bitbuf, uint8_t *pixels, } if ((stages > 0 && level >= 4)) { - av_dlog(NULL, + ff_dlog(NULL, "Error (svq1_decode_block_intra): invalid vector: stages=%i level=%i\n", stages, level); return AVERROR_INVALIDDATA; /* invalid vector */ @@ -253,7 +253,7 @@ static int svq1_decode_block_non_intra(GetBitContext *bitbuf, uint8_t *pixels, continue; /* skip vector */ if ((stages > 0 && level >= 4)) { - av_dlog(NULL, + ff_dlog(NULL, "Error (svq1_decode_block_non_intra): invalid vector: stages=%i level=%i\n", stages, level); return AVERROR_INVALIDDATA; /* invalid vector */ @@ -475,7 +475,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, pitch, motion, x, y, width, height); if (result != 0) { - av_dlog(avctx, "Error in svq1_motion_inter_block %i\n", result); + ff_dlog(avctx, "Error in svq1_motion_inter_block %i\n", result); break; } result = svq1_decode_block_non_intra(bitbuf, current, pitch); @@ -486,7 +486,7 @@ static int svq1_decode_delta_block(AVCodecContext *avctx, HpelDSPContext *hdsp, pitch, motion, x, y, width, height); if (result != 0) { - av_dlog(avctx, "Error in svq1_motion_inter_4v_block %i\n", result); + ff_dlog(avctx, "Error in svq1_motion_inter_4v_block %i\n", result); break; } result = svq1_decode_block_non_intra(bitbuf, current, pitch); @@ -550,7 +550,7 @@ static int svq1_decode_frame_header(AVCodecContext *avctx, AVFrame *frame) bitbuf->size_in_bits >> 3, csum); - av_dlog(avctx, "%s checksum (%02x) for packet data\n", + ff_dlog(avctx, "%s checksum (%02x) for packet data\n", (csum == 0) ? "correct" : "incorrect", csum); } @@ -659,7 +659,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data, result = svq1_decode_frame_header(avctx, cur); if (result != 0) { - av_dlog(avctx, "Error in svq1_decode_frame_header %i\n", result); + ff_dlog(avctx, "Error in svq1_decode_frame_header %i\n", result); return result; } @@ -730,7 +730,7 @@ static int svq1_decode_frame(AVCodecContext *avctx, void *data, previous, linesize, pmv, x, y, width, height); if (result != 0) { - av_dlog(avctx, + ff_dlog(avctx, "Error in svq1_decode_delta_block %i\n", result); goto err; |