diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 14:43:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 14:43:03 +0100 |
| commit | c6664242e0700ea0bc10109c7e84c3f9cf7fb9ae (patch) | |
| tree | 6189919f30f099df68d75cc3ba3d30ec1347467f /libavfilter/af_ashowinfo.c | |
| parent | 98b7a50a2100e3dad96821d2c0adac369652707d (diff) | |
| parent | f5f1cf52240759208b42477e2157a7b4409ade10 (diff) | |
| download | ffmpeg-c6664242e0700ea0bc10109c7e84c3f9cf7fb9ae.tar.gz | |
Merge commit 'f5f1cf52240759208b42477e2157a7b4409ade10'
* commit 'f5f1cf52240759208b42477e2157a7b4409ade10':
oggdec: K&R cosmetic formatting
hlsenc: correctly report target duration
Conflicts:
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_ashowinfo.c')
0 files changed, 0 insertions, 0 deletions