summaryrefslogtreecommitdiff
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| * avconv: move inter/intra matrix to options context.Anton Khirnov2011-09-111-40/+40
| * avconv: remove -psnr option.Anton Khirnov2011-09-111-5/+0
| * avconv: remove me_threshold option.Anton Khirnov2011-09-111-12/+4
| * avconv: move video_rc_override_string to options context.Anton Khirnov2011-09-111-10/+5
| * avconv: move frame pixel format to the options context.Anton Khirnov2011-09-111-27/+13
| * avconv: move frame aspect ratio to the options context.Anton Khirnov2011-09-111-8/+11
| * avconv: move frame size to the options context.Anton Khirnov2011-09-111-31/+17
| * avconv: move frame_rate to the options context.Anton Khirnov2011-09-111-49/+32
| * avconv: move force_fps to the options context.Anton Khirnov2011-09-111-4/+9
| * avconv: move forced_key_frames to the options context.Anton Khirnov2011-09-111-4/+5
| * avconv: rewrite -qscale and -aq handling.Anton Khirnov2011-09-111-25/+17
| * avconv: move audio_sample_rate to the options context.Anton Khirnov2011-09-111-18/+10
| * cmdutils: add support for programs in check_stream_specifier()Anton Khirnov2011-09-111-27/+17
| * avconv: move audio_sample_fmt to options context.Anton Khirnov2011-09-111-24/+12
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-101-94/+53
|\ \ | |/
| * avconv: move audio_channels to the options context.Anton Khirnov2011-09-101-16/+9
| * avconv: move *_disable to options context.Anton Khirnov2011-09-101-21/+14
| * avconv: remove -[vas]lang options.Anton Khirnov2011-09-101-19/+0
| * avconv: move codec tags to options context.Anton Khirnov2011-09-101-38/+30
* | lavfi: rename vsink_buffer.c to sink_buffer.c, and vsink_buffer.h to buffersi...Stefano Sabatini2011-09-061-1/+1
* | lavfi: unify asink_buffer and vsink_buffer APIStefano Sabatini2011-09-061-1/+9
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-212/+225
|\ \ | |/
| * avconv: fix parsing metadata specifiers.Anton Khirnov2011-09-051-1/+1
| * avconv: move mux_preload and mux_max_delay to options contextAnton Khirnov2011-09-051-8/+9
| * avconv: move bitstream filters to options context.Anton Khirnov2011-09-051-37/+22
| * avconv: move rate_emu to options context.Anton Khirnov2011-09-051-8/+12
| * avconv: move max_frames to options context.Anton Khirnov2011-09-051-8/+32
| * avconv: move metadata to options context.Anton Khirnov2011-09-051-24/+48
| * avconv: move ts scale to options context.Anton Khirnov2011-09-051-28/+12
| * avconv: move chapter maps to options context.Anton Khirnov2011-09-051-11/+11
| * avconv: move metadata maps to options context.Anton Khirnov2011-09-051-31/+25
| * avconv: move codec_names to options context.Anton Khirnov2011-09-051-63/+59
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-051-113/+103
|\ \ | |/
| * avconv: move format to options contextAnton Khirnov2011-09-041-22/+14
| * avconv: move limit_filesize to options contextAnton Khirnov2011-09-041-4/+4
| * avconv: move start_time, recording_time and input_ts_offset to options contextAnton Khirnov2011-09-041-41/+27
| * avconv: add a context for options.Anton Khirnov2011-09-041-23/+56
| * cmdutils: add support for caller-provided option context.Anton Khirnov2011-09-041-2/+2
| * cmdutils: move grow_array() from avconv to cmdutils.Anton Khirnov2011-09-041-20/+0
| * cmdutils: move exit_program() declaration to cmdutils from avconvAnton Khirnov2011-09-041-3/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-041-3/+7
|\ \ | |/
| * cmdutils: get rid of dummy contexts for examining AVOptions.Anton Khirnov2011-09-031-3/+7