diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 12:30:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-08 12:30:15 +0200 |
| commit | a5a9bcc8760afafb8d8398a2cf6ffe6a1091dbbe (patch) | |
| tree | ff45078e3c26bfc185734aa65c06f764c88fcd8c /ffprobe.c | |
| parent | d0b27eab925cf5fb372840706a009b173418963f (diff) | |
| parent | f32aefcf349f2f1367f0143782397643416d18f3 (diff) | |
| download | ffmpeg-a5a9bcc8760afafb8d8398a2cf6ffe6a1091dbbe.tar.gz | |
Merge commit 'f32aefcf349f2f1367f0143782397643416d18f3'
* commit 'f32aefcf349f2f1367f0143782397643416d18f3':
faxcompr: K&R formatting cosmetics
Conflicts:
libavcodec/faxcompr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions