Merge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
[ffmpeg.git] / ffserver_config.h
2014-10-29 Michael NiedermayerMerge commit '043ea6f7bfc59399b6b3659da785ec4cc68a008e'
2014-10-29 Michael NiedermayerMerge commit 'f64d7e919eabd427f3e6dd4a1219e448c78deb42'
2014-10-29 Michael NiedermayerMerge commit 'b3d11437ca55d81eeb10c923343ad69b73895fa8'
2014-10-29 Michael NiedermayerMerge commit 'a9179b5bd6f143b4a7ff48bb0d00c8f0a7cafb4b'
2014-10-28 Michael NiedermayerMerge commit '4ad1eba011860224831ce0bb3123f6f55716b68a'
2014-10-28 Michael NiedermayerMerge commit 'ce91b2eae6ea52fc1a7003566d26db20ca62d745'
2014-10-28 Michael NiedermayerMerge commit '26ab504ad8d2b23535c9a0ad43bf1fd0e6aa0893'
2014-10-27 Michael NiedermayerMerge commit '11467ecf519788f2e2f49c63a17eb600e618489e'
2014-10-27 Michael NiedermayerMerge commit 'e6c66f1e4ea19a3aa6ed999c5cb92e1b682c7600'
2014-10-27 Michael NiedermayerMerge commit 'b46b233baffc2076a1a17a264ba9553ae0d4878f'
2014-10-27 Michael NiedermayerMerge commit '090c67d586e3916f9acc49e010b6389d07f97153'
2014-10-27 Michael NiedermayerMerge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'
2014-10-26 Michael NiedermayerMerge commit 'ed6dad3737bf7bb2d5e9fa9511dfdb44806010e8'
2014-10-26 Michael NiedermayerMerge commit '6b9b42cc5576e1819ad1e29d98940066fd14b2d6'
2014-10-26 Michael NiedermayerMerge commit '82ee7d0dda0fec8cdb670f4e844bf5c2927ad9de'
2014-10-26 Michael NiedermayerMerge commit '3f8f1c6ff24ee858eb5b0bf47ef6d4605299a87e'
2014-10-26 Michael NiedermayerMerge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'
2014-10-26 Michael NiedermayerMerge commit '851ace79a307bea54b44bd6f7ecd3b7861c28ec6'
2014-10-25 Michael NiedermayerMerge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8'
2014-10-25 Michael NiedermayerMerge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869'
2014-10-25 Michael NiedermayerMerge commit 'ad6b00d85f686324aa2bd93e39261fa1d411f141'
2014-10-25 Michael NiedermayerMerge commit '28c020d4df9b060a58a124a7a5406d4313fbe249'
2014-10-25 Michael NiedermayerMerge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b'
2014-10-25 Michael NiedermayerMerge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356'
2014-10-25 Michael NiedermayerMerge commit '7785ce1c769369abf85b276148548a5510aabb5f'
2014-10-25 Michael NiedermayerMerge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc'
2014-10-25 Michael NiedermayerMerge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a'
2014-10-25 Michael NiedermayerMerge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d'
2014-10-25 Michael NiedermayerMerge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
2014-10-24 Michael NiedermayerMerge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'
2014-10-24 Michael NiedermayerMerge commit '88b32673db39440422a73ec3047d3326c96b4fb2'
2014-10-24 Michael NiedermayerMerge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce'
2014-10-24 Michael NiedermayerMerge commit '99143140dea12363af680d02e23cb42cfe191679'
2014-10-24 Michael NiedermayerMerge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea'
2014-10-24 Michael NiedermayerMerge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f'
2014-10-24 Michael NiedermayerMerge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72'
2014-10-24 Michael NiedermayerMerge commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666'
2014-10-24 Michael NiedermayerMerge commit '6fdf35fe35d8c1c467708238100648a7a47c930d'
2014-10-24 Michael NiedermayerMerge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'
2014-10-22 Lukasz Marekffserver_conf: factorize parse function per config tag
2014-10-22 Lukasz Marekffserver: move configuration code to separate file