Commit Graph

11 Commits

Author SHA1 Message Date
Caligula useraccount 3b89a67315 ffserver: Use singlejpeg muxer for jpeg
Fixes Ticket4218

Based on patch by: Otávio Ribeiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-08 03:36:22 +02:00
Lukasz Marek 3cb0bec687 ffserver: dont leak child arguments
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-26 23:32:33 +01:00
Lukasz Marek aaf6cc925f ffserver: allow skip setting defaults
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-26 23:32:33 +01:00
Lukasz Marek f61cb6453d ffserver_config: map ffserver options to AVOptions
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-26 23:32:29 +01:00
Lukasz Marek d57a6d2087 ffserver_config: cosmetic: move line_num into FFServerConfig
Moving line_num into FFServerConfig as parser state,
saves many passes of it aside of FFServerConfig pointer.
2014-11-26 23:19:24 +01:00
Lukasz Marek 1a054bd187 ffserver_config: do not store preset name
Preset are translated to AVOptions.
It is not required to reparse anymore.

Fixes CID #1254667

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-17 00:27:25 +01:00
Lukasz Marek a38e06c1aa ffserver_config: handle codec private options
This commit allows to set codec's private option.
As side effect, it also improves preset support.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-16 01:13:38 +01:00
Lukasz Marek 9c097f1cfc ffserver_config: improve AVOption handing
AVOption are checked right after found in config file.
It allows to report exact line in config file.

Options provided more than once are threated as errors.

It also fixes flag options handing.
Flags may occur more than once in config file.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-11-03 00:32:25 +01:00
Lukasz Marek ed1f8915da ffserver_config: postpone codec context creation
So far AVCodecContext was created without codec specified.
This causes internal data to not be initialized to defaults.

This commit postpone context creation until all information is gathered.

Partially fixes #1275
2014-11-01 01:04:12 +01:00
Lukasz Marek 27c61c32ce ffserver_conf: factorize parse function per config tag
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-22 22:37:40 +02:00
Lukasz Marek f524d2e47c ffserver: move configuration code to separate file
This commit doesn't change any existing logic.
It moves ffserver configuration related code to separate file.
It intends to make maintaining easier.

Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
2014-10-22 22:37:40 +02:00