« Previous | Next » 

Revision 2cae9809

ID2cae9809e2d59c7336fc2cccb97b82c7f764868a
Parent 3c9bfb33, 906fd030
Child 2506ad9f

Added by Michael Niedermayer over 9 years ago

Merge remote branch 'qatar/master'

  • qatar/master:
    fate: fix partial run when no samples path is specified
    ARM: NEON fixed-point forward MDCT
    ARM: NEON fixed-point FFT
    lavf: bump minor version and add an APIChanges entry for avio changes
    avio: simplify url_open_dyn_buf_internal by using avio_alloc_context()
    avio: make url_fdopen internal.
    avio: make url_open_dyn_packet_buf internal.
    avio: avio_ prefix for url_close_dyn_buf
    avio: avio_ prefix for url_open_dyn_buf
    avio: introduce an AVIOContext.seekable field
    ac3enc: use generic fixed-point mdct
    lavfi: add fade filter
    Change yadif to not use out of picture lines.
    lavc: deprecate AVCodecContext.antialias_algo
    lavc: mark mb_qmin/mb_qmax for removal on next major bump.

Conflicts:
doc/filters.texi
libavcodec/ac3enc_fixed.h
libavcodec/ac3enc_float.h
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/vf_fade.c

Merged-by: Michael Niedermayer <>

Files

  • added
  • modified
  • copied
  • renamed
  • deleted