diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 14:09:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-01 14:09:32 +0200 |
| commit | 899101d3d39d8165aa3c767efdb1d9c8a010d16d (patch) | |
| tree | af8f68ff372f288f75b1104eb92e6194e35185ce /libavformat/assdec.c | |
| parent | a26789cf9f8000a040a4f4481e0f3552cf63dc68 (diff) | |
| parent | 12c8912de2f2c1a235a7578d6a288e217c3fb504 (diff) | |
| download | ffmpeg-899101d3d39d8165aa3c767efdb1d9c8a010d16d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
crypto: Remove a stray double space
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*
Conflicts:
libavfilter/vf_delogo.c
libavfilter/vf_lut.c
libavfilter/vsrc_testsrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/assdec.c')
0 files changed, 0 insertions, 0 deletions