diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:01:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 09:01:48 +0200 |
| commit | 8e970a58614fe15565d5849c933f17b9ec138647 (patch) | |
| tree | fa7091a33ffeaa1be11ee6ebb4f89c75de2d625f /libavformat/sox.h | |
| parent | 7cd13f618c3cf47c21ec8128ed61f16a14c349ef (diff) | |
| parent | 0d6fa3977b016f1b72b0b24b8834ff9222498548 (diff) | |
| download | ffmpeg-8e970a58614fe15565d5849c933f17b9ec138647.tar.gz | |
Merge commit '0d6fa3977b016f1b72b0b24b8834ff9222498548'
* commit '0d6fa3977b016f1b72b0b24b8834ff9222498548':
rtmp: Add seek support
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/sox.h')
0 files changed, 0 insertions, 0 deletions