diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:08:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-10 10:08:38 +0200 |
| commit | ada9b17e7a3d63b5c58d493006d7b17aa2617813 (patch) | |
| tree | e80c33fea9a15626b97145a6ea2d61c009552f11 /libavformat/network.h | |
| parent | 16ae64ce244a975dc160bef30905de27a8dd34aa (diff) | |
| parent | 8b524ab0c43c1767919530abb79d3656113cdc47 (diff) | |
| download | ffmpeg-ada9b17e7a3d63b5c58d493006d7b17aa2617813.tar.gz | |
Merge commit '8b524ab0c43c1767919530abb79d3656113cdc47'
* commit '8b524ab0c43c1767919530abb79d3656113cdc47':
movenc: Add a warning message if conflicting options have been specified
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/network.h')
0 files changed, 0 insertions, 0 deletions