diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 12:44:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-07 12:44:09 +0100 |
| commit | 774d0c9dbaf580df1570fb46caf5917e20ca5193 (patch) | |
| tree | ff33a07157c77c218586155ab32ef5147aa73d78 /libavformat | |
| parent | 64e4bd7414fc05745e1a723b4da0a44fe7b0558b (diff) | |
| parent | 93d216d37a3f95190ecb9d51cf72f54ea4e04ec7 (diff) | |
Merge commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7'
* commit '93d216d37a3f95190ecb9d51cf72f54ea4e04ec7':
dict: K&R formatting cosmetics
Conflicts:
libavutil/dict.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions