summaryrefslogtreecommitdiff
path: root/avconv.c
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-23
|\
| * avconv: Consistently use PIX_FMT_NONE.Alex Converse2011-11-22
| * avconv: cleanup the transcoding loop in output_packet().Anton Khirnov2011-11-21
| * avconv: split subtitle transcoding out of output_packet().Anton Khirnov2011-11-21
| * avconv: split video transcoding out of output_packet().Anton Khirnov2011-11-21
| * avconv: split audio transcoding out of output_packet().Anton Khirnov2011-11-21
| * avconv: reindent.Anton Khirnov2011-11-21
| * avconv: move streamcopy-only code out of decoding loop.Anton Khirnov2011-11-21
| * avconv: remove an always true condition and reindent.Anton Khirnov2011-11-21
| * avconv: split off streamcopy handling into a separate loop.Anton Khirnov2011-11-21
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-22
|\|
| * avconv: cosmetics, reformat transcode_init()Anton Khirnov2011-11-21
| * avconv: rename 'os' variable to 'oc'Anton Khirnov2011-11-21
* | ffmpeg: 10l add back show_banner() that was lost in the last merge.Michael Niedermayer2011-11-21
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-19
|\|
| * avconv: Set new interrupt callbacks for all AVFormatContexts, use avio_open2(...Martin Storsjö2011-11-18
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-11
|\|
| * avconv: remove some codec-specific hacksAnton Khirnov2011-11-10
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-07
|\|
| * avconv: remove some redundant temporary variables.Anton Khirnov2011-11-06
| * avconv: fix broken indentationAnton Khirnov2011-11-06
| * avconv: move copy_initial_nonkeyframes to the options context.Anton Khirnov2011-11-06
| * avconv: use file:stream instead of file.stream in log messages.Anton Khirnov2011-11-06
| * Call avformat_network_init/deinit in the programsMartin Storsjö2011-11-06
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-04
|\|
| * avconv: add -dump_attachment option.Anton Khirnov2011-11-03
| * avconv: add -attach option.Anton Khirnov2011-11-03
| * avconv: make negative mappings disable only streams from the specified fileAnton Khirnov2011-11-03
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-01
|\|
| * cmdutils: Rename read_file to cmdutils_read_fileMartin Storsjö2011-10-31
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-26
|\|
| * g722dec: remove the use of lowres for half-rate decoding.Justin Ruggles2011-10-25
| * lavf: deprecate AVStream.stream_copyAnton Khirnov2011-10-25
| * avconc: split choose_codec() to choose_decoder/choose_encoder.Anton Khirnov2011-10-25
| * mpegenc: add preload private option.Anton Khirnov2011-10-25
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-20
|\|
| * lavf: replace av_new_stream->avformat_new_stream part II.Anton Khirnov2011-10-19
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-18
|\|
| * avconv: add presetsAlexandra Khirnova2011-10-17
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-13
|\|
| * cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()Anton Khirnov2011-10-12
| * Remove all uses of deprecated AVOptions API.Anton Khirnov2011-10-12
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-10
|\|
| * avtools: add -v as alias for -loglevelMans Rullgard2011-10-09
| * avconv: always print stats with AV_LOG_INFOAnton Khirnov2011-10-09
| * avconv: add -stats option to enable/disable printing encoding progressAnton Khirnov2011-10-09
| * avconv: in output_packet() don't set decoded_data_size for video.Anton Khirnov2011-10-09
| * avconv: remove pointless always true conditionAnton Khirnov2011-10-09
| * avconv: factorize common code in transcode_init()Anton Khirnov2011-10-09
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-29
|\|