diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:29:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:29:40 +0100 |
| commit | a7338ae8acf373244ab28e134f0e09fd745cf383 (patch) | |
| tree | 3ca5e980877003cc89276744c1250da5c6244347 /libavformat/avc.c | |
| parent | 6776c2c04fe6af2efe0c7f7eb61497d0003984c3 (diff) | |
| parent | 25d14b716aef43bf9e82f1d67a364e5922332f47 (diff) | |
| download | ffmpeg-a7338ae8acf373244ab28e134f0e09fd745cf383.tar.gz | |
Merge commit '25d14b716aef43bf9e82f1d67a364e5922332f47' into release/2.2
* commit '25d14b716aef43bf9e82f1d67a364e5922332f47':
http: Refactor process_line
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/avc.c')
0 files changed, 0 insertions, 0 deletions