summaryrefslogtreecommitdiff
path: root/avconv.c
Commit message (Collapse)AuthorAgeFilesLines
* lavf: deprecate r_frame_rate.Anton Khirnov2012-07-291-4/+4
| | | | | | | | | | | | | | | | | | | | According to its description, it is supposed to be the LCM of all the frame durations. The usability of such a thing is vanishingly small, especially since we cannot determine it with any amount of reliability. Therefore get rid of it after the next bump. Replace it with the average framerate where it makes sense. FATE results for the wtv and xmv demux tests change. In the wtv case this is caused by the file being corrupted (or possibly badly cut) and containing invalid timestamps. This results in lavf estimating the framerate wrong and making up wrong frame durations. In the xmv case the file contains pts jumps, so again the estimated framerate is far from anything sane and lavf again makes up different frame durations. In some other tests lavf starts making up frame durations from different frame.
* avprobe/avconv: fix tentative declaration compile errors on MSVS.Ronald S. Bultje2012-07-281-2/+3
|
* avconv: print an error message when demuxing fails.Anton Khirnov2012-07-171-0/+5
| | | | | | Also exit in such a case if -xerror is used. Fixes bug 329.
* avconv: propagate fatal errors from lavfi.Anton Khirnov2012-07-091-1/+3
|
* avconv: use only meaningful timestamps in start time check.Anton Khirnov2012-07-061-4/+5
|
* avconv: fix the check for -ss as an output option.Anton Khirnov2012-07-061-1/+1
| | | | | start time is already substracted from the frame timestamp, so it needs to be checked against 0, not start time.
* avconv: fix parsing of -force_key_frames option.Reimar Döffinger2012-07-051-1/+9
| | | | | | | Currently it always exits with an error when more than one position is specified. CC: libav-stable@libav.org
* avconv: Set audio filter time base to the sample rateMartin Storsjö2012-07-051-1/+5
| | | | | | | | | | | | | | | | | If the output frame size is smaller than the input sample rate, and the input stream time base corresponds exactly to the input frame size (getting input packet timestamps like 0, 1, 2, 3, 4 etc), the output timestamps from the filter will be like 0, 1, 2, 3, 4, 4, 5 ..., leadning to non-monotone timestamps later. A concrete example is input mp3 data having frame sizes of 1152 samples, transcoded to aac with 1024 sample frames. By setting the audio filter time base to the sample rate, we will get sensible timestamps for all output packets, regardless of the ratio between the input and output frame sizes. Signed-off-by: Martin Storsjö <martin@martin.st>
* cmdutils: Pass the actual chosen encoder to filter_codec_optsMartin Storsjö2012-06-301-2/+2
| | | | | | | This allows passing the right options to encoders when there's more than one encoder for a certain codec id. Signed-off-by: Martin Storsjö <martin@martin.st>
* avconv: add an assert to silence an uninitialized variable warning.Anton Khirnov2012-06-261-0/+1
| | | | | | | The warning silenced was: avconv.c: In function ‘opt_output_file’: avconv.c:3380:21: warning: ‘meta_out’ may be used uninitialized in this function [-Wuninitialized] avconv.c:3315:20: note: ‘meta_out’ was declared here
* avconv: shut up an uninitialized variable warning.Anton Khirnov2012-06-261-1/+3
| | | | | | | The warning silenced was: avconv.c: In function ‘configure_filtergraph’: avconv.c:603:8: warning: ‘ist’ may be used uninitialized in this function [-Wuninitialized] avconv.c:549:18: note: ‘ist’ was declared here
* avconv: don't include vsrc_buffer.h, which doesn't exist anymoreAnton Khirnov2012-06-261-1/+0
|
* avconv: fix -force_key_framesAnton Khirnov2012-06-261-27/+32
| | | | | parse_forced_keyframes() relies in encoder timebase being set, so call it from transcode_init() after it is known.
* avconv: remove a forgotten debugging printf.Anton Khirnov2012-06-241-1/+0
|
* avconv: use more descriptive names for hardcoded filters.Anton Khirnov2012-06-241-12/+32
| | | | | | Also ensure that all such filters get a non-NULL name. Should fix FATE failures on some architectures after 58b049f2fa4f192b00baadb5f1f32ca366f936ea.
* avconv: remove redundant handling of async.Anton Khirnov2012-06-241-28/+0
| | | | | | Because of a mistake during merging the code for simple and complex filtergraphs, -async inserts an asyncts filter both on input and output. Remove the output hunk.
* Replace usleep() calls with av_usleep()Mans Rullgard2012-06-221-4/+4
| | | | | | | This reduces the dependency on unistd.h which is not available on all systems. Signed-off-by: Mans Rullgard <mans@mansr.com>
* Remove unnecessary inclusions of [sys/]time.hMans Rullgard2012-06-201-1/+0
| | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
* avconv: don't try to free threads that were not initialized.Anton Khirnov2012-06-141-1/+1
|
* lavfi: make AVFilterPad opaque after two major bumps.Anton Khirnov2012-06-131-6/+8
| | | | It will allow adding new fields to it without ABI breaks.
* avconv: support only native pthreads.Anton Khirnov2012-06-121-11/+7
| | | | | Our w32pthreads wrapper has various issues and is only supposed to be used in libavcodec.
* avconv: multithreaded demuxing.Anton Khirnov2012-06-101-2/+155
| | | | | | | | When there are multiple input files, run demuxing for each input file in a separate thread, so reading packets does not block. This is useful for achieving low latency when reading from multiple (possibly slow) input streams.
* avtools: move buffer management code from avconv to cmdutils.Anton Khirnov2012-06-051-142/+0
| | | | It will be used by avplay.
* avconv: don't use InputStream in the buffer management code.Anton Khirnov2012-06-051-20/+21
| | | | | | Use just the pointer to the head of the buffer pool. This will allow sharing the code with avplay.
* avconv: fix exiting when max frames is reached.Anton Khirnov2012-06-051-1/+1
| | | | | frame number should never be strictly larger than max frames, so the if() was never triggered.
* avconv: check output stream recording time before each frame returned from ↵Anton Khirnov2012-06-041-2/+2
| | | | | | | filters There may be multiple frames returned, so with just one check we can write more than requested to the output.
* avconv: split selecting input file out of transcode().Anton Khirnov2012-06-041-19/+24
|
* avconv: split checking for active outputs out of transcode().Anton Khirnov2012-06-041-18/+33
|
* avconv: extend -r to work on any input stream.Anton Khirnov2012-05-291-4/+42
| | | | This is done by automatically inserting a setpts filter.
* avconv: don't print filters inserted by avconv in stream mappings.Anton Khirnov2012-05-291-10/+33
|
* avconv: merge configuration code for complex and simple filtersAnton Khirnov2012-05-291-258/+85
| | | | | Some tests change because -s now inserts the scaler to the end instead of beginning of the filtergraph.
* avconv: split configuring input filters out of configure_complex_filterAnton Khirnov2012-05-291-37/+61
|
* avconv: Display the error returned by avformat_write_headerMartin Storsjö2012-05-261-2/+6
| | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* avconv: rename transcode_audio/video to decode_audio/video.Anton Khirnov2012-05-221-4/+4
| | | | | Those functions do only decoding now, encoding is run from poll_filters().
* avconv: reindentAnton Khirnov2012-05-181-66/+66
|
* avconv: replace -vsync cfr code with the fps filter.Anton Khirnov2012-05-181-93/+57
| | | | | | | | Invented timestamps for the h264 tests return to something resembling sanity. In the idroq-video-encode test when converting 25 fps -> 30 fps the fifth frame gets duplicated instead of the sixth.
* avconv: add support for audio in complex filtergraphs.Anton Khirnov2012-05-181-13/+133
|
* avconv: fix behavior with -ss as an output option.Anton Khirnov2012-05-171-2/+4
| | | | | | | Don't return from poll_filters() immediately, there may be other frames and/or other streams to handle. Fixes a memleak.
* avconv: automatically insert asyncts when -async is used.Anton Khirnov2012-05-141-0/+27
| | | | Deprecate -async.
* avconv: add support for audio filters.Anton Khirnov2012-05-141-478/+328
| | | | | The FATE changes are all off-by-one due to different rounding being used (lrintf vs av_rescale_q).
* buffersrc: add av_buffersrc_write_frame().Anton Khirnov2012-05-141-2/+1
| | | | | | | It's the same as av_vsrc_buffer_add_frame(), except it doesn't take pts or pixel_aspect parameters. Those are read from AVFrame. Deprecate av_vsrc_buffer_add_frame().
* avconv: use lrint() for rounding double timestampsMans Rullgard2012-05-101-2/+2
| | | | | | | | | | | | Converting the double to float for lrintf() loses precision when the value is not exactly representable as a single-precision float. Apart from being inaccurate, this causes discrepancies in some configurations due to differences in rounding. Note that the changed timestamp in the vc1-ism test is a bogus, made-up value. Signed-off-by: Mans Rullgard <mans@mansr.com>
* lavc: pad last audio frame with silence when needed.Anton Khirnov2012-05-091-8/+0
|
* lavfi: add video buffer sink, and use it in avtoolsAnton Khirnov2012-05-091-30/+74
| | | | | | Also add the public interface libavfilter/buffersink.h. Based on a commit by Stefano Sabatini.
* avconv: remove stray useless comment.Anton Khirnov2012-05-061-1/+0
|
* avutil: add av_parse_cpu_flags() functionMans Rullgard2012-04-251-55/+4
| | | | | | | This moves the cpu flag parsing code from avconv to avutil so it can be accessed elsewhere. Signed-off-by: Mans Rullgard <mans@mansr.com>
* avconv: use libavresampleJustin Ruggles2012-04-241-71/+64
|
* avconv: fix a segfault on -c copy with -filter_complex.Anton Khirnov2012-04-241-1/+12
|
* avconv: fix off by one check in complex_filterLuca Barbato2012-04-221-1/+1
| | | | nb_input_files is already an invalid index.
* ARM: allow runtime masking of CPU featuresMans Rullgard2012-04-221-0/+8
| | | | | | | This allows masking CPU features with the -cpuflags avconv option which is useful for testing different optimisations without rebuilding. Signed-off-by: Mans Rullgard <mans@mansr.com>
View Lorry Controller Status