diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:08:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-08 04:08:07 +0200 |
| commit | 4cd066b69c08cd91aa4b5e40deb4b2f5c7e651ee (patch) | |
| tree | a36d18d2f9cafe7c57ab7d97392d112c9b210139 /ffmpeg.c | |
| parent | 7023715e888005f405a34ec1111d98cf3230bdaf (diff) | |
| parent | 21732063a346475eb22c332b27e8216b79f9ad4a (diff) | |
Merge commit '21732063a346475eb22c332b27e8216b79f9ad4a'
* commit '21732063a346475eb22c332b27e8216b79f9ad4a':
movenc: K&R formatting cosmetics
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions