diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 00:16:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-27 00:16:34 +0200 |
| commit | 9a2850c26af8fbf4766fd6d6795c6687eab44bbc (patch) | |
| tree | a12bc274b126512a2bb7dadfea819283a1170f8c /ffserver.c | |
| parent | 877716a79c9d649624b67b1fa328825e2c055cc9 (diff) | |
| parent | a7fcd4122b19b0f934020f4e261d0c44c4c32e11 (diff) | |
| download | ffmpeg-9a2850c26af8fbf4766fd6d6795c6687eab44bbc.tar.gz | |
Merge commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11'
* commit 'a7fcd4122b19b0f934020f4e261d0c44c4c32e11':
output example: store the scaling context in the stream context
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffserver.c')
0 files changed, 0 insertions, 0 deletions