diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:48:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-06 03:49:58 +0200 |
| commit | f28d3f98c5bb09d748e49cb851f043927c7b11cb (patch) | |
| tree | 948bd0533f8c92ec1423ce2b34a325d54f4b1e14 /doc/ffserver.conf | |
| parent | 146648771c953cf50d98617eaa250ebdf423ffaf (diff) | |
| parent | 8b86c2ed2eb29dce137b26e66a9bddd50f72817f (diff) | |
| download | ffmpeg-f28d3f98c5bb09d748e49cb851f043927c7b11cb.tar.gz | |
Merge commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f' into release/2.4
* commit '8b86c2ed2eb29dce137b26e66a9bddd50f72817f':
Revert "lavfi: always check av_expr_parse_and_eval() return value"
See: 98d4a07ccf97696c6b7e38e6b0e04e8fd5eba9c3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.conf')
0 files changed, 0 insertions, 0 deletions