• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 715c8a5a
    Michael Niedermayer authored
    
    
    * qatar/master: (28 commits)
      dfa: use more meaningful return codes
      eatgv: check vector_bits
      eatgv: check motion vectors
      Mark a number of variables only used in av_dlog() calls as av_unused.
      dvdec: drop const qualifier from variable to eliminate a warning
      avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation.
      tests/utils: don't ignore the return value of fwrite()
      lavfi/formats: use sizeof(var) instead of sizeof(type).
      lavfi: remove avfilter_default_config_input_link() declaration
      lavfi: always enable the scale filter and depend on sws.
      vf_split: support user-specifiable number of outputs.
      avconv: remove stray useless comment.
      mpegmux: add stuffing to avoid incomplete PCM frames
      rtsp: avoid const warnings from strtol() call
      avserver: check return value of ftruncate()
      lagarith: make offset array type unsigned
      dfa: add some checks to ensure that decoder won't write past frame end
      aacps: NEON optimisations
      aacps: align some arrays
      aacps: move some loops to function pointers
      ...
    
    Conflicts:
    	configure
    	doc/filters.texi
    	libavcodec/dfa.c
    	libavcodec/eatgv.c
    	libavfilter/Makefile
    	libavfilter/allfilters.c
    	libavfilter/avfilter.h
    	libavfilter/formats.c
    	libavfilter/vf_split.c
    
    Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
    715c8a5a