diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 16:12:18 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-15 16:12:24 +0100 |
commit | 77041e2474a107bb86259ab2c8b1bc6600ed093f (patch) | |
tree | 277dab3d3787cb6e12441f465c4881baf03bf1b4 /libavfilter/vsrc_testsrc.c | |
parent | b52925d2cde98b2a3ffaf451248191c8627d356a (diff) | |
parent | 094a7405e5d8463d7d167d893e04934ec1a84ecd (diff) | |
download | ffmpeg-77041e2474a107bb86259ab2c8b1bc6600ed093f.tar.gz |
Merge commit '094a7405e5d8463d7d167d893e04934ec1a84ecd'
* commit '094a7405e5d8463d7d167d893e04934ec1a84ecd':
x86: ABSB: port to cpuflags
sdp: Include SRTP crypto params if using the srtp protocol
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vsrc_testsrc.c')
0 files changed, 0 insertions, 0 deletions