• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · be315a32
    Michael Niedermayer authored
    * qatar/master:
    Duplicate  AMV: disable DR1 and don't override EMU_EDGE
    Duplicate  lavf: inspect more frames for fps when container time base is coarse
    Wrong and we have correct fix: Fix races in default av_log handler
      vorbis: Replace sized int_fast integer types with plain int/unsigned.
      Remove disabled non-optimized code variants.
    NO  bswap.h: Remove disabled code.
      Remove some disabled printf debug cruft.
      Replace more disabled printf() calls by av_dlog().
    NO  tests: Remove disabled code.
    NO  Replace some commented-out debug printf() / av_log() messages with av_dlog().
      vorbisdec: Replace some sizeof(type) by sizeof(*variable).
    NO  vf_fieldorder: Replace FFmpeg by Libav in license boilerplate.
    
    Conflicts:
    	libavcodec/h264.c
    	libavcodec/vorbisdec.c
    	libavutil/log.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    be315a32
ffmpeg.c 163 KB