• Michael Niedermayer's avatar
    Merge remote branch 'qatar/master' · 2cae9809
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    2cae9809
nutenc.c 27.6 KB