« Previous | Next » 

Revision be315a32

IDbe315a3232d96a2704e276f1ebe870a4d249d090
Parent 500bf397, 70892657
Child 97dc86b7

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • 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: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted