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/jpegls.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/jpegls.c')
| -rw-r--r-- | libavcodec/jpegls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/jpegls.c b/libavcodec/jpegls.c index 216c486001..7f9fa8d60c 100644 --- a/libavcodec/jpegls.c +++ b/libavcodec/jpegls.c @@ -25,6 +25,7 @@ * JPEG-LS common code. */ +#include "internal.h" #include "jpegls.h" void ff_jpegls_init_state(JLSState *state) @@ -96,5 +97,5 @@ void ff_jpegls_reset_coding_parameters(JLSState *s, int reset_all) if (s->reset == 0 || reset_all) s->reset = 64; - av_dlog(NULL, "[JPEG-LS RESET] T=%i,%i,%i\n", s->T1, s->T2, s->T3); + ff_dlog(NULL, "[JPEG-LS RESET] T=%i,%i,%i\n", s->T1, s->T2, s->T3); } |