diff options
| author | Michael Niedermayer <[email protected]> | 2014-03-14 00:52:07 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2014-03-14 00:52:07 +0100 |
| commit | fdf4eb7911b37e49716b5a64004498ff308a8324 (patch) | |
| tree | d10e8f7c7c950ae707cb94b6246bc1a39025b8ec /libavcodec/cook_parser.c | |
| parent | 3a27f968f9902d6ce2278f61c422ede4b9dbf70e (diff) | |
| parent | 945673f792eb4141860ed66664156df685f7b7f0 (diff) | |
Merge commit '945673f792eb4141860ed66664156df685f7b7f0'
* commit '945673f792eb4141860ed66664156df685f7b7f0':
dsputil_template: K&R formatting cosmetics
Conflicts:
libavcodec/dsputil_template.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/cook_parser.c')
0 files changed, 0 insertions, 0 deletions