diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:18:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 12:18:18 +0200 |
| commit | 2ac6d6b7cdd48b21f021221fec186d1ab424994a (patch) | |
| tree | 918de338a2133078fa354bb3b0114dac508bf70d /libavformat/g722.c | |
| parent | 5fd254c4f6db58b74a02a38f0d724e5fdc149d88 (diff) | |
| parent | c14010541035454b4d3ad08399d70423be4e0c87 (diff) | |
| download | ffmpeg-2ac6d6b7cdd48b21f021221fec186d1ab424994a.tar.gz | |
Merge commit 'c14010541035454b4d3ad08399d70423be4e0c87'
* commit 'c14010541035454b4d3ad08399d70423be4e0c87':
oma: K&R formatting cosmetics
Conflicts:
libavformat/omadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/g722.c')
0 files changed, 0 insertions, 0 deletions