diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 20:52:19 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-20 20:52:19 +0100 |
| commit | 76d7676fccee4febb8ddb39f53a5b9a643cb2efd (patch) | |
| tree | f256f220a921a5761ea72e230f6c1cd4f9af3941 /doc/examples/avcodec.c | |
| parent | 8b66b43128eafc5f0abf0c81a5a523a2aedd5996 (diff) | |
| parent | 2539cf1c814190a017cb8986b41aa2f949e37fd9 (diff) | |
| download | ffmpeg-76d7676fccee4febb8ddb39f53a5b9a643cb2efd.tar.gz | |
Merge commit '2539cf1c814190a017cb8986b41aa2f949e37fd9'
* commit '2539cf1c814190a017cb8986b41aa2f949e37fd9':
hpeldsp_template: K&R formatting cosmetics
Conflicts:
libavcodec/hpeldsp_template.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/examples/avcodec.c')
0 files changed, 0 insertions, 0 deletions