diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 04:02:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-16 04:02:57 +0100 |
| commit | 251331491299ae89732203edc16d9b6a06f2bd79 (patch) | |
| tree | a9945e76f9d9191fb430bb1f26895e99dd01c1ad /libavformat/rtpdec_mpeg12.c | |
| parent | e727cbf0be206e4fe48776735c44b9cdfa96b332 (diff) | |
| parent | 82a3e469c6584e6d9e56a3fc38eb001d0650defa (diff) | |
| download | ffmpeg-251331491299ae89732203edc16d9b6a06f2bd79.tar.gz | |
Merge commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa' into release/2.2
* commit '82a3e469c6584e6d9e56a3fc38eb001d0650defa':
http: Improve options descriptions
Conflicts:
doc/protocols.texi
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpdec_mpeg12.c')
0 files changed, 0 insertions, 0 deletions