diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-15 11:29:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-15 11:34:30 +0200 |
| commit | 2c959eccc69cca1a5b83d643d01271df2b280bb5 (patch) | |
| tree | 6c63ab0822727cfc9864788fcb1e201018a329bb /libswresample/rematrix_template.c | |
| parent | bfbe07670bb0d0d902c03953d44f9482709696ee (diff) | |
| parent | c3386bd5b4d3662f94e902a0fe3e9e869e29967d (diff) | |
| download | ffmpeg-2c959eccc69cca1a5b83d643d01271df2b280bb5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpproto: Check for the right feature when reading a sockaddr_in6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/rematrix_template.c')
0 files changed, 0 insertions, 0 deletions