diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 14:12:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 14:12:11 +0200 |
| commit | c7dd2365f432cf8338596a37e04556b66889d3e2 (patch) | |
| tree | d643b2ed947ee9e8eb5e4ae8bf4f64adc918ac29 /ffserver_config.c | |
| parent | 3b0534efdcde122ace74196be8c22afd9b03c017 (diff) | |
| parent | be101bc1e357c50fcb740bc4870b3bacc93a5727 (diff) | |
| download | ffmpeg-c7dd2365f432cf8338596a37e04556b66889d3e2.tar.gz | |
Merge commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727'
* commit 'be101bc1e357c50fcb740bc4870b3bacc93a5727':
avconv: create the complex filtergraphs earlier
Conflicts:
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'ffserver_config.c')
0 files changed, 0 insertions, 0 deletions