summaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Add option -n to exit if output file exists.Carl Eugen Hoyos2011-11-241-2/+4
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-241-26/+26
|\ \ | |/
| * avconv: fix segfault at EOF with delayed picturesJanne Grunau2011-11-241-2/+5
| * avconv: remove a now unused parameter from output_packet().Anton Khirnov2011-11-231-3/+3
| * avconv: formatting fixes in output_packet()Anton Khirnov2011-11-231-6/+7
| * avconv: declare some variables in blocks where they are usedAnton Khirnov2011-11-231-3/+3
| * avconv: use the same behavior when decoding audio/video/subsAnton Khirnov2011-11-231-13/+8
| * avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.Anton Khirnov2011-11-231-1/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-231-330/+366
|\ \ | |/
| * avconv: Consistently use PIX_FMT_NONE.Alex Converse2011-11-221-2/+2
| * avconv: cleanup the transcoding loop in output_packet().Anton Khirnov2011-11-211-45/+14
| * avconv: split subtitle transcoding out of output_packet().Anton Khirnov2011-11-211-25/+34
| * avconv: split video transcoding out of output_packet().Anton Khirnov2011-11-211-84/+100
| * avconv: split audio transcoding out of output_packet().Anton Khirnov2011-11-211-93/+112
| * avconv: reindent.Anton Khirnov2011-11-211-63/+63
| * avconv: move streamcopy-only code out of decoding loop.Anton Khirnov2011-11-211-25/+30
| * avconv: remove an always true condition and reindent.Anton Khirnov2011-11-211-21/+19
| * avconv: split off streamcopy handling into a separate loop.Anton Khirnov2011-11-211-72/+90
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-221-46/+54
|\ \ | |/
| * avconv: cosmetics, reformat transcode_init()Anton Khirnov2011-11-211-37/+46
| * avconv: rename 'os' variable to 'oc'Anton Khirnov2011-11-211-12/+12
* | ffmpeg: 10l add back show_banner() that was lost in the last merge.Michael Niedermayer2011-11-211-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-191-13/+15
|\ \ | |/
| * avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2(...Martin Storsjö2011-11-181-9/+15
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-111-4/+0
|\ \ | |/
| * avconv: remove some codec-specific hacksAnton Khirnov2011-11-101-4/+0
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-071-29/+33
|\ \ | |/
| * avconv: remove some redundant temporary variables.Anton Khirnov2011-11-061-11/+8
| * avconv: fix broken indentationAnton Khirnov2011-11-061-6/+6
| * avconv: move copy_initial_nonkeyframes to the options context.Anton Khirnov2011-11-061-3/+8
| * avconv: use file:stream instead of file.stream in log messages.Anton Khirnov2011-11-061-10/+10
| * Call avformat_network_init/deinit in the programsMartin Storsjö2011-11-061-0/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-041-21/+133
|\ \ | |/
| * avconv: add -dump_attachment option.Anton Khirnov2011-11-031-19/+69
| * avconv: add -attach option.Anton Khirnov2011-11-031-1/+62
| * avconv: make negative mappings disable only streams from the specified fileAnton Khirnov2011-11-031-1/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-011-1/+1
|\ \ | |/
OpenPOWER on IntegriCloud