diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-24 01:22:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-24 01:22:31 +0200 |
| commit | 02ea384abd8ef53a1e4654ab0c9e72e08141d751 (patch) | |
| tree | 27dd65c965e6f3f7132f8f7da7a8b76fac0c470a /libavformat/adtsenc.c | |
| parent | 629e5e28f70a3511d7267f328773b191c5f086ac (diff) | |
| parent | 6133d65861f265d429ade53e910fe877c95a1615 (diff) | |
| download | ffmpeg-02ea384abd8ef53a1e4654ab0c9e72e08141d751.tar.gz | |
Merge commit '6133d65861f265d429ade53e910fe877c95a1615'
* commit '6133d65861f265d429ade53e910fe877c95a1615':
fft-test: K&R formatting cosmetics
Conflicts:
libavcodec/fft-test.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/adtsenc.c')
0 files changed, 0 insertions, 0 deletions