diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:34:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 16:34:58 +0200 |
| commit | 2ce46a959c20ee72ad276e4b02bd50b522e1362a (patch) | |
| tree | 34d81dc165698c520409b284233935cb8fe49413 /libavformat/tcp.c | |
| parent | 8ca0d74d5945339c70539d363d9132470731c8da (diff) | |
| parent | 9f7119b7fe003e94d72e81f3aa922568c2827dce (diff) | |
| download | ffmpeg-2ce46a959c20ee72ad276e4b02bd50b522e1362a.tar.gz | |
Merge commit '9f7119b7fe003e94d72e81f3aa922568c2827dce' into release/1.1
* commit '9f7119b7fe003e94d72e81f3aa922568c2827dce':
movenc: allow override of "writing application" tag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/tcp.c')
0 files changed, 0 insertions, 0 deletions