diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:37:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 03:37:53 +0100 |
| commit | bcc6429c01a8d244ee0f45f045ab00edf6391b7e (patch) | |
| tree | 451f25fd9e8c849bd2f39946d9603b0d893b7443 /libavformat/id3v2.c | |
| parent | bdb219435e0bf97bc4c40b84417b8e39b4e49f30 (diff) | |
| parent | 40de74d0eb8c1898e2184a1484fe246aed5b295d (diff) | |
| download | ffmpeg-bcc6429c01a8d244ee0f45f045ab00edf6391b7e.tar.gz | |
Merge commit '40de74d0eb8c1898e2184a1484fe246aed5b295d' into release/2.2
* commit '40de74d0eb8c1898e2184a1484fe246aed5b295d':
http: Export Content-Type information
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/id3v2.c')
0 files changed, 0 insertions, 0 deletions