• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 9765caec
    Michael Niedermayer authored
    * qatar/master:
      adpcm: split ADPCM encoders and decoders into separate files.
      doc/avconv: fix typo.
      rv34: check that subsequent slices have the same type as first one.
      smacker demuxer: handle possible av_realloc() failure.
      lavfi: add split filter from soc.
      lavfi: add showinfo filter
      libxavs: add private options corresponding to deprecated global options
    
    Conflicts:
    	Changelog
    	libavcodec/adpcm.c
    	libavfilter/avfilter.h
    	libavfilter/vf_showinfo.c
    	libavfilter/vf_split.c
    	libavformat/smacker.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    9765caec
adpcm_data.h 1.25 KB