aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/concat.c
Commit message (Expand)AuthorAgeFilesLines
* avformat/concat: Check protocol prefixMichael Niedermayer2016-01-281-1/+4
* Merge commit '95d312d6c82e7485f43c3ddda0f369af0e41c83b'Michael Niedermayer2014-09-251-13/+15
|\
| * concat: K&R formatting cosmeticsGabriel Dume2014-09-251-13/+15
* | Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'Michael Niedermayer2013-09-271-1/+1
|\|
| * lavf: Allocate arrays with av_realloc if they will be realloced laterMartin Storsjö2013-09-261-1/+1
* | avformat/concat: revert one hunk of 20dfab33f5ab61fc51de65192ed239f8b62782a2Michael Niedermayer2013-09-191-2/+3
* | Merge commit '5626f994f273af80fb100d4743b963304de9e05c'Michael Niedermayer2013-09-191-8/+4
|\|
| * avformat: Use av_reallocp() where suitableAlexandra Khirnova2013-09-181-8/+4
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-021-13/+7
|\|
| * proto: Realign struct initializersMartin Storsjö2011-12-011-5/+5
| * proto: Use .priv_data_size to allocate the private contextMartin Storsjö2011-12-011-8/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-141-1/+2
|\|
| * avio: add support for passing options to protocols.Anton Khirnov2011-11-131-1/+2
| * avio: Add an AVIOInterruptCB parameter to ffurl_open/ffurl_allocMartin Storsjö2011-11-131-1/+1
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-091-6/+5
|\|
| * lavf: use designated initializers for all protocolsAnton Khirnov2011-04-081-6/+5
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-051-8/+9
|\|
| * avio: make url_filesize() internal.Anton Khirnov2011-04-041-1/+1
| * avio: make url_close() internal.Anton Khirnov2011-04-041-2/+2
| * avio: make url_seek() internal.Anton Khirnov2011-04-041-3/+3
| * avio: make url_read() internal.Anton Khirnov2011-04-041-1/+1
| * avio: make url_open() internal.Anton Khirnov2011-04-041-1/+2
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| * Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-261-1/+1
* | Prefix all _demuxer, _muxer, _protocol from libavformat and libavdevice.Diego Elio Pettenò2011-01-281-1/+1
|/
* Fix concat seeking SEEK_END case.Wolfram Gloger2010-03-081-2/+2
* Fix concat seek result.Wolfram Gloger2010-03-081-1/+1
* Implement a physical concatenation protocol.Michele Orrù2010-02-071-0/+198