diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 12:59:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 13:04:40 +0200 |
| commit | 97947d9bba51bb3936a7907fde20c3b242c0d218 (patch) | |
| tree | fe0e62c8e326f17ea72a4ea55a4da974bb6a6da2 /ffserver.c | |
| parent | e27be795f019a8ba41c33b0cf0e3a060069252ea (diff) | |
| parent | 183880cfc4aae53ce504e13337791cad5841c80c (diff) | |
| download | ffmpeg-97947d9bba51bb3936a7907fde20c3b242c0d218.tar.gz | |
Merge commit '183880cfc4aae53ce504e13337791cad5841c80c'
* commit '183880cfc4aae53ce504e13337791cad5841c80c':
pictor: use the correct logging context
No change, as this has already been fixed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions