diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 19:58:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 19:58:57 +0200 |
| commit | 8365287e613d82e8fc1e842878cbbe285c1d592d (patch) | |
| tree | d5574957cc893aa84f5f3e5863a1eaa4336fb802 /libavresample | |
| parent | 06e5d28e33e9e3b9e38ff958f29bba925e44d573 (diff) | |
| parent | f1f6156b3fc9eb77b439d031ba18974d80b8341e (diff) | |
| download | ffmpeg-8365287e613d82e8fc1e842878cbbe285c1d592d.tar.gz | |
Merge commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e'
* commit 'f1f6156b3fc9eb77b439d031ba18974d80b8341e':
matroska: K&R formatting cosmetics
Conflicts:
libavformat/matroskaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
0 files changed, 0 insertions, 0 deletions