diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 01:56:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-07 02:01:39 +0100 |
| commit | 92e79e595b564f5c5a637a151f24ac726cabcd27 (patch) | |
| tree | 02b7a1ed5020012c05d00c70eca384e41c95ff40 /libavfilter/vf_ass.c | |
| parent | c526a01c91979e907be3f5b475eadc663c03aadb (diff) | |
| parent | a0c5917f86a6ff0d91d7f9af71afca0d43c14825 (diff) | |
| download | ffmpeg-92e79e595b564f5c5a637a151f24ac726cabcd27.tar.gz | |
Merge remote-tracking branch 'qatar/master'
Merge only for metadata, no commits merged
* qatar/master:
Drop Snow codec
Prepare for 10_alpha1 Release
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_ass.c')
0 files changed, 0 insertions, 0 deletions