diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 11:26:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-28 11:26:57 +0200 |
| commit | edab63a4067ad4cd35d8d9259620983fc7c843f8 (patch) | |
| tree | 1b3da86553d3db4ac1637cc84e657bc49fa03154 /libavformat/sctp.c | |
| parent | 63c0113588d61d5ed045e1937c473770453c53be (diff) | |
| parent | 966689442ed843019dc0722a49bfb0ac51755d19 (diff) | |
| download | ffmpeg-edab63a4067ad4cd35d8d9259620983fc7c843f8.tar.gz | |
Merge commit '966689442ed843019dc0722a49bfb0ac51755d19'
* commit '966689442ed843019dc0722a49bfb0ac51755d19':
buffersink: K&R formatting cosmetics
Conflicts:
libavfilter/buffersink.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sctp.c')
0 files changed, 0 insertions, 0 deletions