aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-181-1/+19
|\
| * avconv: fix -frames for video encoders with delay.Anton Khirnov2012-01-171-1/+19
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-171-100/+105
|\|
| * avconv: use avcodec_encode_audio2()Justin Ruggles2012-01-151-100/+105
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-131-11/+12
|\|
| * avconv: use AVFrame.width/height/format instead of corresponding AVCodecConte...Anton Khirnov2012-01-121-8/+7
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-111-14/+35
|\|
| * avconv: reinitialize the filtergraph on resolution change.Anton Khirnov2012-01-101-12/+32
| * avconv: fix -copyinkf.Anton Khirnov2012-01-101-2/+2
* | cmdutils: make show_usage() use av_log()Stefano Sabatini2012-01-071-3/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-051-7/+23
|\|
| * avconv: add symbolic names for -vsync parametersAnton Khirnov2012-01-041-7/+23
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-031-10/+1
|\|
| * avconv: remove the 'codec framerate is different from stream' warningAnton Khirnov2012-01-021-10/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-021-10/+20
|\|
| * avconv: make -frames work for all types of streams, not just video.Anton Khirnov2012-01-011-10/+11
| * avconv: free bitstream filtersJanne Grunau2012-01-011-0/+9
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-301-294/+303
|\|
| * avconv: K&R cosmeticsAneesh Dogra2011-12-291-297/+306
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-261-13/+178
|\|
| * avconv: avoid memcpy in vsrc_buffer when possible.Anton Khirnov2011-12-251-15/+37
| * avconv: implement get_buffer()/release_buffer().Anton Khirnov2011-12-251-0/+142
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-231-0/+1
|\|
| * mov: Don't stick the QuickTime field ordering atom in extradata.Alex Converse2011-12-211-0/+1
* | ff*: Fix duplicatedly printed version info with -versionMichael Niedermayer2011-12-201-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-171-88/+119
|\|
| * avconv: support stream specifiers in -metadata and -map_metadataAlexandra Khirnova2011-12-161-88/+119
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-131-3/+3
|\|
| * Replace all uses of av_close_input_file() with avformat_close_input().Anton Khirnov2011-12-121-2/+2
| * avconv: update -map option help textJanne Grunau2011-12-121-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-121-1/+1
|\|
| * Fix a bunch of common typos.Diego Biurrun2011-12-111-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-111-45/+1
|\|
| * avconv: drop code for special handling of avserver streams.Anton Khirnov2011-12-101-44/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-091-1/+1
|\|
| * avconv: remove unsubstantiated commentLuca Barbato2011-12-081-1/+1
* | ffmpeg: more exact comment about libavformat.Michael Niedermayer2011-12-081-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-061-40/+46
|\|
| * avconv: only allocate 1 AVFrame per input streamJustin Ruggles2011-12-051-16/+21
| * avconv: fix memleaks due to not freeing the AVFrame for audioJustin Ruggles2011-12-051-0/+4
| * avconv: use avcodec_decode_audio4() instead of avcodec_decode_audio3()Justin Ruggles2011-12-041-29/+26
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-031-2/+3
|\|
| * Do not memcpy raw video frames when using null muxerMans Rullgard2011-12-021-2/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-011-21/+14
|\|
| * avconv: make copy_tb on by default.Anton Khirnov2011-11-301-4/+2
| * avconv: compute next_pts from input packet duration when possible.Anton Khirnov2011-11-301-1/+3
| * avconv: update InputStream.pts in the streamcopy case.Anton Khirnov2011-11-301-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-301-15/+16
|\|
| * avconv: Handle audio sync for non-S16 sample formats.Alex Converse2011-11-281-15/+16
* | cmdutils: pass AVCodec to filter_codec_opts()Michael Niedermayer2011-11-271-2/+2