• Michael Niedermayer's avatar
    Merge commit '6a85dfc8' · 8f7b022c
    Michael Niedermayer authored
    * commit '6a85dfc8':
      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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    8f7b022c
aacdec.c 124 KB