diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:58:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:58:41 +0100 |
| commit | 946cbf04ee95d800526f591ae194378fdec91150 (patch) | |
| tree | 0e24ae75607f21315387028444eb50fbef601126 /libavcodec/flacdsp_lpc_template.c | |
| parent | afb3fb335265a443aac83883606fa4274b4330b7 (diff) | |
| parent | 4750b05d67fd87263cb767b896e1cf55713a39de (diff) | |
| download | ffmpeg-946cbf04ee95d800526f591ae194378fdec91150.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
af_join: do not leak input frames.
asrc_anullsrc: return EOF, not -1
Conflicts:
libavfilter/asrc_anullsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdsp_lpc_template.c')
0 files changed, 0 insertions, 0 deletions