diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:54:32 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-11 11:54:37 +0200 |
| commit | 15c92f8c486a91ca2bd8607a088bee2219c34452 (patch) | |
| tree | bf238631bc90e87fea4cf9983faadac9bd854317 /libswresample/resample.c | |
| parent | 99091ff217440daa33fddcf66170e1a6d630c3a4 (diff) | |
| parent | 5718e3487ba3b26aba341070be0b6b0b4de45ea3 (diff) | |
| download | ffmpeg-15c92f8c486a91ca2bd8607a088bee2219c34452.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtmp: Do not misuse memcmp
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample.c')
0 files changed, 0 insertions, 0 deletions