• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 31ab1575
    Michael Niedermayer authored
    * qatar/master:
      avcodec: Convert some commented-out printf/av_log instances to av_dlog
      avcodec: Drop silly and/or broken printf debug output
      avcodec: Drop some silly commented-out av_log() invocations
      avformat: Convert some commented-out printf/av_log instances to av_dlog
      avformat: Remove non-compiling and/or silly commented-out printf/av_log statements
      Remove some silly disabled code.
      ac3dec: ensure get_buffer() gets a buffer for the correct number of channels
    
    Conflicts:
    	libavcodec/dnxhddec.c
    	libavcodec/ffv1.c
    	libavcodec/h264.c
    	libavcodec/h264_parser.c
    	libavcodec/mjpegdec.c
    	libavcodec/motion_est_template.c
    	libavcodec/mpegaudiodec.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/put_bits.h
    	libavcodec/ratecontrol.c
    	libavcodec/wmaenc.c
    	libavdevice/timefilter.c
    	libavformat/asfdec.c
    	libavformat/avidec.c
    	libavformat/avienc.c
    	libavformat/flvenc.c
    	libavformat/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    31ab1575
motion_est.c 76.4 KB