diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 09:35:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 09:35:03 +0200 |
| commit | bb5ef961647f06425eff236d9575db0ab6ae66f1 (patch) | |
| tree | 6f5148c7061625a39caedc299d8477aeeb00139b /libavformat/samidec.c | |
| parent | a59a64cbc85375b7a6a0266c62f654e2ea80a5c6 (diff) | |
| parent | 3799376dd3373ee255651ed542c75b15665801a8 (diff) | |
| download | ffmpeg-bb5ef961647f06425eff236d9575db0ab6ae66f1.tar.gz | |
Merge commit '3799376dd3373ee255651ed542c75b15665801a8'
* commit '3799376dd3373ee255651ed542c75b15665801a8':
lavfi/fifo: fix flushing when using request_samples
Conflicts:
libavfilter/fifo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/samidec.c')
0 files changed, 0 insertions, 0 deletions