diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-12 20:49:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-12 21:01:12 +0200 |
| commit | 9765caec1b9991e676d1b91db0c04a6242b65d7a (patch) | |
| tree | dcd5a8d04e7c5a61aa12b455424fb4d0d9b2d076 /libavutil/intfloat_readwrite.c | |
| parent | f0c64d0d0b16162a46d7b88d09ac0801a94e59a7 (diff) | |
| parent | 826c56d16e55f3819a75d01f957dd295aa1e9f3a (diff) | |
| download | ffmpeg-9765caec1b9991e676d1b91db0c04a6242b65d7a.tar.gz | |
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>
Diffstat (limited to 'libavutil/intfloat_readwrite.c')
0 files changed, 0 insertions, 0 deletions