diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:39:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-03 23:39:42 +0100 |
| commit | 1af235f6b3449dee85c81d7a89f03c5c491224f6 (patch) | |
| tree | ec72b8e0c06b9f0298256338768650e96e2a49f8 /libavcodec/flacenc.c | |
| parent | 82031e41f8203f32c7cedc2f43dc1b3bd2f55d62 (diff) | |
| parent | 5df52b0131d3d4d804ad6e221bc9a2cd8b201ef2 (diff) | |
| download | ffmpeg-1af235f6b3449dee85c81d7a89f03c5c491224f6.tar.gz | |
Merge remote-tracking branch 'qatar/release/10' into release/2.2
* qatar/release/10:
ituh263: reject b-frame with pp_time = 0
af_compand: replace strtok_r() with av_get_token()
latm: Always reconfigure if no extradata was set previously
af_compand: add a dependency on strtok_r
lavfi: add compand audio filter
Conflicts:
Changelog
doc/filters.texi
libavfilter/Makefile
libavfilter/af_compand.c
libavfilter/allfilters.c
libavfilter/version.h
All changes are already in our 2.2 branch, this is just for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacenc.c')
0 files changed, 0 insertions, 0 deletions