summaryrefslogtreecommitdiff
path: root/ffserver.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release/0.8' into release/0.7Michael Niedermayer2012-01-091-0/+1
|\
| * Merge remote-tracking branch 'qatar/release/0.7' into release/0.8Michael Niedermayer2012-01-081-0/+1
| |\
| | * avserver: Fix a bug where the socket is IPv4, but IPv6 is autoselected for th...Nathan Caldwell2012-01-051-0/+1
| | * lavc: introduce avcodec_open2() as a replacement for avcodec_open().Anton Khirnov2011-11-191-1/+1
| * | Make all option parsing functions match the function pointer type through whi...Jeff Downs2011-09-071-1/+2
* | | Make all option parsing functions match the function pointer type through whi...Jeff Downs2011-09-071-1/+2
* | | Merge branch 'master' into oldabiMichael Niedermayer2011-06-211-19/+17
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-181-21/+18
| |\ \ | | |/
| | * ffserver: use new avformat_open_* API.Anton Khirnov2011-06-161-20/+17
| | * AVOptions: add av_opt_find() as a replacement for av_find_opt.Anton Khirnov2011-06-161-1/+1
* | | Merge branch 'master' into oldabiMichael Niedermayer2011-06-161-17/+15
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-9/+10
| |\ \ | | |/
| | * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-081-9/+10
| * | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-2/+2
| |\ \ | | |/
| | * Replace custom DEBUG preprocessor trickery by the standard one.Diego Biurrun2011-06-031-2/+2
| * | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-271-16/+12
| |\ \ | | |/
| | * ffserver: move close_connection() call to avoid a temporary string and copy.Mike Williams2011-05-261-7/+4
| | * ffserver: Fix a null pointer dereference as a result of the FF_API_MAX_STREAM...Mike Williams2011-05-261-11/+10
| * | ffserver: dont just crashMike William2011-05-211-5/+4
| * | fix ffserver's SIGSEGVMaksym Veremeyenko2011-05-211-0/+1
* | | Merge branch 'master' into oldabiMichael Niedermayer2011-05-151-2/+0
|\ \ \ | |/ /
| * | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-131-2/+0
| |\ \ | | |/
| | * configure: Do not unconditionally add -D_POSIX_C_SOURCE to CPPFLAGS.Diego Biurrun2011-05-121-2/+0
* | | Merge commit 'd7e5aeb' into oldabiMichael Niedermayer2011-05-021-2/+0
|\ \ \ | |/ /
| * | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-271-2/+0
| |\ \ | | |/
| | * Eliminate pointless '#if 1' statements without matching '#else'.Diego Biurrun2011-04-261-2/+0
* | | Merge branch 'master' into oldabiMichael Niedermayer2011-04-251-1/+1
|\ \ \ | |/ /
| * | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-241-1/+1
| |\ \ | | |/
| | * Lowercase all ff* program names.Diego Biurrun2011-04-231-1/+1
| | * Replace more FFmpeg instances by Libav or ffmpeg.Diego Biurrun2011-04-231-1/+1
| * | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-201-11/+5
| |\ \ |/ / / | | _
| * prefer avio_check() over url_exist()Stefano Sabatini2011-04-191-2/+2
| * avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbolsStefano Sabatini2011-04-191-2/+2
| * lavc: remove the FF_API_SET_STRING_OLD cruft.Anton Khirnov2011-04-191-1/+1
| * lavf: remove FF_API_MAX_STREAMS cruftAnton Khirnov2011-04-191-6/+0
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-091-1/+2
|\ \ | |/
| * lavf: get rid of ffm-specific stuff in avformat.hAnton Khirnov2011-04-081-0/+1
| * lavf: rename avf_sdp_create to av_sdp_create.Anton Khirnov2011-04-081-1/+1
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-081-2/+2
|\ \ | |/
| * avio: AVIO_ prefixes for URL_ open flags.Anton Khirnov2011-04-071-2/+2
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-041-21/+23
|\ \ | |/
| * avio: make url_open_dyn_packet_buf internal.Anton Khirnov2011-04-031-2/+4
| * avio: avio_ prefix for url_close_dyn_bufAnton Khirnov2011-04-031-8/+8
| * avio: avio_ prefix for url_open_dyn_bufAnton Khirnov2011-04-031-7/+7
| * avio: introduce an AVIOContext.seekable fieldAnton Khirnov2011-04-031-4/+4
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
|/
* avio: deprecate url_open_bufAnton Khirnov2011-03-161-1/+2
* avio: avio_ prefix for url_fprintfAnton Khirnov2011-03-161-63/+63
* avio: rename url_fopen/fclose -> avio_open/close.Anton Khirnov2011-02-231-2/+2
* libavformat: Remove FF_NETERRNO()Martin Storsjö2011-02-231-16/+16