summaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * cmdutils: Rename read_file to cmdutils_read_fileMartin Storsjö2011-10-311-1/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-261-41/+46
|\ \ | |/
| * g722dec: remove the use of lowres for half-rate decoding.Justin Ruggles2011-10-251-4/+1
| * lavf: deprecate AVStream.stream_copyAnton Khirnov2011-10-251-13/+12
| * avconc: split choose_codec() to choose_decoder/choose_encoder.Anton Khirnov2011-10-251-25/+29
| * mpegenc: add preload private option.Anton Khirnov2011-10-251-2/+5
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-201-1/+4
|\ \ | |/
| * lavf: replace av_new_stream->avformat_new_stream part II.Anton Khirnov2011-10-191-1/+4
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-181-1/+76
|\ \ | |/
| * avconv: add presetsAlexandra Khirnova2011-10-171-1/+76
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-131-43/+8
|\ \ | |/
| * cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()Anton Khirnov2011-10-121-40/+4
| * Remove all uses of deprecated AVOptions API.Anton Khirnov2011-10-121-4/+4
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-101-16/+10
|\ \ | |/
| * avtools: add -v as alias for -loglevelMans Rullgard2011-10-091-7/+0
| * avconv: always print stats with AV_LOG_INFOAnton Khirnov2011-10-091-1/+1
| * avconv: add -stats option to enable/disable printing encoding progressAnton Khirnov2011-10-091-0/+6
| * avconv: in output_packet() don't set decoded_data_size for video.Anton Khirnov2011-10-091-1/+0
| * avconv: remove pointless always true conditionAnton Khirnov2011-10-091-2/+1
| * avconv: factorize common code in transcode_init()Anton Khirnov2011-10-091-6/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-291-9/+55
|\ \ | |/
OpenPOWER on IntegriCloud