diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 13:57:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 13:57:57 +0100 |
| commit | f02033b98b7545dad2e123a939ac7dceb1ce2f7a (patch) | |
| tree | ebdd92421e55fdf3d3010b25c7d69b7e4f7f75fa /libavfilter/vf_ass.c | |
| parent | 14aa358c20c222b991c56d13b4da536dc84763d3 (diff) | |
| parent | f713411d4cfbd9c467aeda77b16ca6bc4db55d10 (diff) | |
| download | ffmpeg-f02033b98b7545dad2e123a939ac7dceb1ce2f7a.tar.gz | |
Merge commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10'
* commit 'f713411d4cfbd9c467aeda77b16ca6bc4db55d10':
mdec: cosmetics, reformat
Conflicts:
libavcodec/mdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_ass.c')
0 files changed, 0 insertions, 0 deletions