diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:24:38 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-25 14:24:38 +0100 |
| commit | b2d0c5bd13ab100a3acb18e9c869d73904e6e764 (patch) | |
| tree | 2a8f631ce05e08be8829862b1cdd5cb72971b898 /libavdevice/alsa-audio-common.c | |
| parent | e9125dd5563484a067ef75b6fce4fbef235c5c6e (diff) | |
| parent | 33552a5f7b6ec7057516f487b1a902331f8c353e (diff) | |
| download | ffmpeg-b2d0c5bd13ab100a3acb18e9c869d73904e6e764.tar.gz | |
Merge commit '33552a5f7b6ec7057516f487b1a902331f8c353e'
* commit '33552a5f7b6ec7057516f487b1a902331f8c353e':
arm: Add mathops.h to ARCH_HEADERS list
avstring: K&R formatting cosmetics
Conflicts:
libavutil/avstring.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/alsa-audio-common.c')
0 files changed, 0 insertions, 0 deletions