diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 02:52:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 02:52:17 +0100 |
| commit | 21d4c571fabe7e0bfc6de8214edb88d733b7624f (patch) | |
| tree | 8d26d89e002f42d8b12ea73119540b47d7c8b2a6 /.gitignore | |
| parent | df41cbee85c8aac02646f39a68e2f6b911b73f18 (diff) | |
| parent | 4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa (diff) | |
| download | ffmpeg-21d4c571fabe7e0bfc6de8214edb88d733b7624f.tar.gz | |
Merge commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa'
* commit '4ff99ab3d7d5576e99e6b8a411b4a44500ed88fa':
http: Refactor process_line
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions