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/gifdec.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/gifdec.c')
| -rw-r--r-- | libavcodec/gifdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 9ba436e14c..c179f45c30 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -148,7 +148,7 @@ static int gif_read_image(GifState *s, AVFrame *frame) has_local_palette = flags & 0x80; bits_per_pixel = (flags & 0x07) + 1; - av_dlog(s->avctx, "image x=%d y=%d w=%d h=%d\n", left, top, width, height); + ff_dlog(s->avctx, "image x=%d y=%d w=%d h=%d\n", left, top, width, height); if (has_local_palette) { pal_size = 1 << bits_per_pixel; @@ -315,7 +315,7 @@ static int gif_read_extension(GifState *s) ext_code = bytestream2_get_byteu(&s->gb); ext_len = bytestream2_get_byteu(&s->gb); - av_dlog(s->avctx, "ext_code=0x%x len=%d\n", ext_code, ext_len); + ff_dlog(s->avctx, "ext_code=0x%x len=%d\n", ext_code, ext_len); switch(ext_code) { case GIF_GCE_EXT_LABEL: @@ -336,13 +336,13 @@ static int gif_read_extension(GifState *s) s->transparent_color_index = -1; s->gce_disposal = (gce_flags >> 2) & 0x7; - av_dlog(s->avctx, "gce_flags=%x tcolor=%d disposal=%d\n", + ff_dlog(s->avctx, "gce_flags=%x tcolor=%d disposal=%d\n", gce_flags, s->transparent_color_index, s->gce_disposal); if (s->gce_disposal > 3) { s->gce_disposal = GCE_DISPOSAL_NONE; - av_dlog(s->avctx, "invalid value in gce_disposal (%d). Using default value of 0.\n", ext_len); + ff_dlog(s->avctx, "invalid value in gce_disposal (%d). Using default value of 0.\n", ext_len); } ext_len = bytestream2_get_byteu(&s->gb); @@ -359,7 +359,7 @@ static int gif_read_extension(GifState *s) bytestream2_skipu(&s->gb, ext_len); ext_len = bytestream2_get_byteu(&s->gb); - av_dlog(s->avctx, "ext_len1=%d\n", ext_len); + ff_dlog(s->avctx, "ext_len1=%d\n", ext_len); } return 0; } @@ -395,7 +395,7 @@ static int gif_read_header1(GifState *s) s->avctx->sample_aspect_ratio.den = 64; } - av_dlog(s->avctx, "screen_w=%d screen_h=%d bpp=%d global_palette=%d\n", + ff_dlog(s->avctx, "screen_w=%d screen_h=%d bpp=%d global_palette=%d\n", s->screen_width, s->screen_height, s->bits_per_pixel, s->has_global_palette); |