diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 22:03:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-03 22:10:21 +0200 |
| commit | 75a9859ac67b60105769fda7160db081216b70f2 (patch) | |
| tree | 520b217f1254806bbe9a2634b9f0ecadb14b2a12 /doc | |
| parent | 235d401bfa407806a468379611bd7ed23e5cd0df (diff) | |
| parent | d2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b (diff) | |
Merge commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b'
* commit 'd2a4e4b9cc9a0c2661e1c1d6f6b51babac2cec1b':
wma: K&R formatting cosmetics
Conflicts:
libavcodec/wma.c
libavcodec/wmadec.c
libavcodec/wmaenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions