aboutsummaryrefslogtreecommitdiffstats
path: root/avconv.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-3/+3
|\|
| * avconv: fix some bugs introduced in 630902a1e1336e7ee0cf3dcbcb6eb07af8edf660Michael Niedermayer2011-09-011-3/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-011-18/+0
|\|
| * avconv: remove -threads option.Anton Khirnov2011-08-301-18/+0
* | Merge commit 'f593628e5868e52a46de666767896c6afcebdae4'Michael Niedermayer2011-08-311-5/+3
|\|
| * avconv: Replace raw picture frame swapping hack.Alex Converse2011-08-301-5/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-291-25/+6
|\|
| * avconv: remove stubs of crop* and pad* optionsAnton Khirnov2011-08-291-20/+0
| * avconv: re-add nb_streams to InputFile.Anton Khirnov2011-08-291-5/+8
| * doxygen: fix wrong comment syntax, //< vs. ///<Diego Biurrun2011-08-261-3/+3
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-241-6/+2
|\|
| * avconv: Replace goto redo on decode fail with continue.Alex Converse2011-08-241-2/+1
| * avconv: Remove dead store.Alex Converse2011-08-241-1/+0
| * avconv: use av_clip_int16 for audio clippingAlex Converse2011-08-231-3/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-231-2/+6
|\|
| * avconv: print the codecs names in the stream mapping.Nicolas George2011-08-231-0/+4
| * avconv: move the avcodec_find_decoder() call to add_input_streams().Anton Khirnov2011-08-231-2/+2
* | Fix compilation with --disable-avfilter.Carl Eugen Hoyos2011-08-231-0/+1
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-211-27/+39
|\|
| * avconv: Separate initialization from the main transcode loop.Alex Converse2011-08-191-25/+37
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-201-13/+13
|\|
| * avconv: reset input_ts_offset between files.Anton Khirnov2011-08-191-0/+1
| * avconv: call flush_encoders() from transcode() directly.Anton Khirnov2011-08-191-6/+3
| * avconv: fix broken indentation.Anton Khirnov2011-08-191-1/+1
| * avconv: rescue poor abused limit_filesize global.Anton Khirnov2011-08-191-6/+8
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-08-191-3/+9
|\|
| * avconv: Set error code before before jumping to fail.Alex Converse2011-08-191-3/+9