diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 02:59:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-03 02:59:14 +0200 |
| commit | 2976e2a102cd8202e0f7b9e601d62354b7ad1c72 (patch) | |
| tree | b0b2663c448af7ee268e74414f62e94bbefcc581 /libavformat/ircamdec.c | |
| parent | d2021f74ed5e14d2675065550ff95a225c0b60cf (diff) | |
| parent | 50a4d076ce630db9b5b72c3e6348970e13ae1fb6 (diff) | |
| download | ffmpeg-2976e2a102cd8202e0f7b9e601d62354b7ad1c72.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavfi/trim: mark link closed on EOF.
ffmpeg: ignore EOF when pushing frames to filters.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/ircamdec.c')
0 files changed, 0 insertions, 0 deletions