Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Sep 2011 18:49:20 +0000 (20:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 12 Sep 2011 19:01:12 +0000 (21:01 +0200)
commit9765caec1b9991e676d1b91db0c04a6242b65d7a
treedcd5a8d04e7c5a61aa12b455424fb4d0d9b2d076
parentf0c64d0d0b16162a46d7b88d09ac0801a94e59a7
parent826c56d16e55f3819a75d01f957dd295aa1e9f3a
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
doc/avconv.texi
libavcodec/Makefile
libavcodec/adpcm.c
libavcodec/adpcm.h
libavcodec/adpcm_data.c
libavcodec/adpcm_data.h
libavcodec/adpcmenc.c
libavcodec/libxavs.c
libavcodec/rv34.c
libavfilter/vf_showinfo.c
libavformat/smacker.c