diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:56:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:56:22 +0200 |
| commit | 6e3830cca297996736784016a8bc908f8cb98cf3 (patch) | |
| tree | 6fc159bb36e4aa048d851a3892b7c33d88124721 /libavformat/rtmpcrypt.c | |
| parent | 6a356801952b6c38042ef267808dbacbdb700eef (diff) | |
| parent | d21bf0d27b547adcaabaa28d475e6b9f97dfe20a (diff) | |
| download | ffmpeg-6e3830cca297996736784016a8bc908f8cb98cf3.tar.gz | |
Merge commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a' into release/1.1
* commit 'd21bf0d27b547adcaabaa28d475e6b9f97dfe20a':
resample: fix avresample_get_delay() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpcrypt.c')
0 files changed, 0 insertions, 0 deletions