diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:48:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-05 12:48:25 +0200 |
| commit | e7f8493fd8c9f1d0f7618dc068b5cb38e0395574 (patch) | |
| tree | 09864e1703143f5f1a25105fd4aca3ad485c3e52 /libswresample | |
| parent | fdccb84e3b94d3710c6aa253ccc68ad01c17cb45 (diff) | |
| parent | 20c86571ccc71412781d4a4813e4693e0c42aec6 (diff) | |
| download | ffmpeg-e7f8493fd8c9f1d0f7618dc068b5cb38e0395574.tar.gz | |
Merge commit '20c86571ccc71412781d4a4813e4693e0c42aec6'
* commit '20c86571ccc71412781d4a4813e4693e0c42aec6':
lavfi: let gcc realign the stack on public graph driving functions
Conflicts:
libavfilter/buffersink.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample')
0 files changed, 0 insertions, 0 deletions