summaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * avconv: Reformat s16 volume adjustment.Alex Converse2011-09-281-7/+6
| * avconv: Initialize return value for codec copy path.Alex Converse2011-09-271-1/+1
| * avconv: Fix volume adjustment for non-s16 sample formatsAlex Converse2011-09-271-0/+47
| * avconv: Make samples void*.Alex Converse2011-09-271-1/+1
| * avconv: Use the size of the decode sample format when allocating the audio sa...Alex Converse2011-09-271-2/+2
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-281-31/+39
|\ \ | |/
| * avconv: use different variables for decoded and filtered frame.Anton Khirnov2011-09-271-11/+25
| * avconv: add support for copying attachments.Anton Khirnov2011-09-271-0/+9
| * avconv: factorize common code from new_*_stream()Anton Khirnov2011-09-271-17/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-271-174/+157
|\ \ | |/
| * avconv: replace all fprintf() by av_log().Anton Khirnov2011-09-261-132/+116
| * avconv: change av_log verbosity from ERROR to FATAL for fatal errors.Anton Khirnov2011-09-261-24/+24
| * avtools: parse loglevel before all the other options.Anton Khirnov2011-09-261-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-251-7/+2
|\ \ | |/
| * avconv: use correct output stream index when checking max_framesAnton Khirnov2011-09-251-2/+2
| * avconv: remove fake coded_frame on streamcopy hackAnton Khirnov2011-09-251-5/+0
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-241-0/+1
|\ \ | |/
| * avconv: actually set InputFile.rate_emuAnton Khirnov2011-09-231-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-121-319/+226
|\ \ | |/
| * avconv: use correct index when selecting metadata to write to.Anton Khirnov2011-09-111-2/+2
| * avconv: fix inverted variableAnton Khirnov2011-09-111-1/+1
| * avconv: move streamid_map to options context.Anton Khirnov2011-09-111-12/+10
| * avconv: extend -vf syntaxAnton Khirnov2011-09-111-12/+20
| * avconv: move top_field_first to options context.Anton Khirnov2011-09-111-11/+10
OpenPOWER on IntegriCloud