diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:20:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-28 23:20:39 +0100 |
| commit | c5c4e5839ad1459bdbd69ffa7d33949577662a6c (patch) | |
| tree | 14d617f6e00b12a8698572e4d025ba77f96607fe /libavcodec/amrwbdata.h | |
| parent | 1fb3642317768c02db0eaf8d0d118d37a970f091 (diff) | |
| parent | e14f98c62fdf8744b07419314095d1b3248cce75 (diff) | |
| download | ffmpeg-c5c4e5839ad1459bdbd69ffa7d33949577662a6c.tar.gz | |
Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'
* commit 'e14f98c62fdf8744b07419314095d1b3248cce75':
tcp: Clarify the units for the timeout avoptions
Conflicts:
libavformat/tcp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/amrwbdata.h')
0 files changed, 0 insertions, 0 deletions