summaryrefslogtreecommitdiff
path: root/ffmpeg.c
Commit message (Collapse)AuthorAge
* ffmpeg: fix a crash with complex filters when pix_fmt is not specifiedMatthieu Bouron2012-05-20
| | | | | | | ffmpeg -i in.mxf -filter_complex "[0:0]fieldorder=tff" out.wav will fail with an error message instead of crashing. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: drop get_sync_ipts() and drop related special case for videoMichael Niedermayer2012-05-20
| | | | | Idea found in a commit from Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: move setting big_picture.pts upMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: change AVFMT_RAWPICTURE pts to reduce diff to qatarMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: random cosmectics to reduce diff to qatarMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: cosmetics to reduce difference to qatar by 101 linesMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: cosmetics to reduce difference to qatar by about 90 linesMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: move ost->frame_rate setting code before the filtergraph stuffMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: drop pkt_ptsMichael Niedermayer2012-05-20
| | | | | | | Reduces diff to qatar by 9 lines Should not change anything Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: set the video filters timebase to the demuxers.Michael Niedermayer2012-05-20
| | | | | Inspired-by a change from Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: reintroducing check_recording_time()Michael Niedermayer2012-05-20
| | | | | | | This reduces the difference to qatar by 27 lines No functional change, the code should be unused Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* ffmpeg: fix uninitialized variable warningMichael Niedermayer2012-05-20
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '755cd4197d53946208e042f095b930dca18d9430'Michael Niedermayer2012-05-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '755cd4197d53946208e042f095b930dca18d9430': mov: enable parsing for VC-1. lavfi: Add fps filter. lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs. avconv: add support for audio in complex filtergraphs. Conflicts: ffmpeg.c libavfilter/version.h libavformat/mov.c tests/ref/fate/vc1-ism Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: inject a aresample filter for -asyncMichael Niedermayer2012-05-19
| | | | | | | | | | | | Based on similar code from anton Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: misc cosmetics.Clément Bœsch2012-05-19
| | | | | | | | | | Reduce diff against avconv, and change some doxycomments into normal comments (no point in doxifying ffmpeg internal fields).
* | ffmpeg: adapt to the buffersrc API changes.Nicolas George2012-05-19
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-19
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: doc: Replace some @file tags by more suitable markup. fate: Set FUZZ factor of vorbis-13 test to 2. fate: Set FUZZ factor of (e)ac3-encode test to 3. fate: remove unused code from regressions-funcs.sh rtmp: Don't assume path points to a string of nonzero length avconv: fix behavior with -ss as an output option. Conflicts: doc/platform.texi doc/protocols.texi ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix warning & bug for keep_pix_fmtMichael Niedermayer2012-05-19
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unused variable i.Clément Bœsch2012-05-18
| |
* | ffmpeg: do not deprecate -vol and -map_channel.Clément Bœsch2012-05-18
| | | | | | | | These helpers are handy, just notice the user it is done using lavfi.
* | ffmpeg: resurrect -map_channel.Clément Bœsch2012-05-18
| |
* | ffmpeg: automatically insert volume filter when -vol is used.Clément Bœsch2012-05-17
| | | | | | | | | | | | Deprecate -vol. Inspired by asyncts auto-insert patch from Anton Khirnov.
* | ffmpeg: use av_buffersrc_add_frame() for audio tooMichael Niedermayer2012-05-17
| | | | | | | | | | | | fixes a memleak Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge branch 'audio-filters' of https://github.com/ubitux/FFmpegMichael Niedermayer2012-05-17
|\ \ | | | | | | | | | | | | | | | | | | | | | * 'audio-filters' of https://github.com/ubitux/FFmpeg: lavfi/pan: add supported sample rates to avoid a crash. ffmpeg: do not warn when expecting EOF from lavfi. Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * | ffmpeg: do not warn when expecting EOF from lavfi.Clément Bœsch2012-05-17
| | |
* | | ffmpeg: fix ;;Michael Niedermayer2012-05-17
|/ / | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move audio timestamp roundup code.Michael Niedermayer2012-05-17
| | | | | | | | | | | | | | This fixes a regression which lead to non monotone timestamps at the end of a file. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add support for audio filters.Anton Khirnov2012-05-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the FATE changes are due to off-by-one different rounding being used (lrintf vs av_rescale_q). Some fate changes are due to 1 audio frame less being encoded (the new variant seems matching what qatar does and according to ffprobe its closer to the requested duration) the mapchan feature sadly is lost in this commit because it depends on resampling being done in ffmpeg.c which is now moved completely into the av filter layer -async is broken after this commit, this will be fixed in subsequent commits the new filter reconfiguration system is flawed and will drop a frame on each parameter change which is why the nelly moser checksums need updating. Conflicts: ffmpeg.c tests/ref/fate/smjpeg
* | ffmpeg: allow switching to qatars buffersrc APIMichael Niedermayer2012-05-17
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: affect computed filtered frame pts after filling frame from bufferMatthieu Bouron2012-05-14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: accept + prefix to -pix_fmt option to disable automatic conversions.Nicolas George2012-05-14
| |
* | ffmpeg: revert 492cc1Michael Niedermayer2012-05-14
| | | | | | | | | | | | This restores correct block_align values in case of stream copy. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: preserve bits_per_coded sample on stream copy.Michael Niedermayer2012-05-12
| | | | | | | | | | | | Fixes Ticket1124 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: employ better names and add a convenient shorthand for vp6 tests arm/neon: dsputil: use correct size specifiers on vld1/vst1 arm: dsputil: prettify some conditional instructions in put_pixels macros vqavideo: change x/y loop counters to the usual pattern avconv: use lrint() for rounding double timestamps Conflicts: tests/ref/fate/vc1-ism Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix deinterlaceMichael Niedermayer2012-05-11
| | | | | | | | | | | | Fixes ticket1295 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix pointer type (const) warningMichael Niedermayer2012-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unused variablesMichael Niedermayer2012-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix uninitialized variable warningMichael Niedermayer2012-05-10
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) libxvid: Give more suitable names to libxvid-related files. libxvid: Separate libxvid encoder from libxvid rate control code. jpeglsdec: Remove write-only variable in ff_jpegls_decode_lse(). fate: cosmetics: lowercase some comments fate: Give more consistent names to some RealVideo/RealAudio tests. lavfi: add avfilter_get_audio_buffer_ref_from_arrays(). lavfi: add extended_data to AVFilterBuffer. lavc: check that extended_data is properly set in avcodec_encode_audio2(). lavc: pad last audio frame with silence when needed. samplefmt: add a function for filling a buffer with silence. samplefmt: add a function for copying audio samples. lavr: do not try to copy to uninitialized output audio data. lavr: make avresample_read() with NULL output discard samples. fate: split idroq audio and video into separate tests fate: improve dependencies fate: add convenient shorthands for ea-vp6, libavcodec, libavutil tests fate: split some combined tests into separate audio and video tests fate: fix dependencies for probe tests mips: intreadwrite: fix inline asm for gcc 4.8 mips: intreadwrite: remove unnecessary inline asm ... Conflicts: cmdutils.h configure doc/APIchanges doc/filters.texi ffmpeg.c ffplay.c libavcodec/internal.h libavcodec/jpeglsdec.c libavcodec/libschroedingerdec.c libavcodec/libxvid.c libavcodec/libxvid_rc.c libavcodec/utils.c libavcodec/version.h libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersink.h tests/Makefile tests/fate/aac.mak tests/fate/audio.mak tests/fate/demux.mak tests/fate/ea.mak tests/fate/image.mak tests/fate/libavutil.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/microsoft.mak tests/fate/qt.mak tests/fate/real.mak tests/fate/screen.mak tests/fate/video.mak tests/fate/voice.mak tests/fate/vqf.mak tests/ref/fate/ea-mad tests/ref/fate/ea-tqi Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix frame duration used for video sync.Michael Niedermayer2012-05-09
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: print next_dts too on debug_tsMichael Niedermayer2012-05-07
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-06
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (28 commits) dfa: use more meaningful return codes eatgv: check vector_bits eatgv: check motion vectors Mark a number of variables only used in av_dlog() calls as av_unused. dvdec: drop const qualifier from variable to eliminate a warning avcodec: Improve comment for thread_safe_callbacks to avoid misinterpretation. tests/utils: don't ignore the return value of fwrite() lavfi/formats: use sizeof(var) instead of sizeof(type). lavfi: remove avfilter_default_config_input_link() declaration lavfi: always enable the scale filter and depend on sws. vf_split: support user-specifiable number of outputs. avconv: remove stray useless comment. mpegmux: add stuffing to avoid incomplete PCM frames rtsp: avoid const warnings from strtol() call avserver: check return value of ftruncate() lagarith: make offset array type unsigned dfa: add some checks to ensure that decoder won't write past frame end aacps: NEON optimisations aacps: align some arrays aacps: move some loops to function pointers ... Conflicts: configure doc/filters.texi libavcodec/dfa.c libavcodec/eatgv.c libavfilter/Makefile libavfilter/allfilters.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/vf_split.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: do not include vsrc_buffer.h.Nicolas George2012-05-06
| |
* | ffmpeg: replace av_vsrc_buffer_add_frame by av_buffersrc_add_frame.Nicolas George2012-05-06
| |
* | ffmpeg: replace av_buffersrc_buffer with av_buffersrc_add_ref.Nicolas George2012-05-06
| |
* | ffmpeg: fix indent in term_init().Clément Bœsch2012-05-04
| |
* | ffmpeg: stronger ffpresets parsing.Clément Bœsch2012-05-04
| | | | | | | | | | This fixes at least issues with empty lines, and also allows CRLF lines (in case a user makes its own preset on a MS plateform).
* | ffmpeg: fix indent.Clément Bœsch2012-05-03
| |
* | ffmpeg: use AVFrame accessor.Nicolas George2012-05-03
| |
* | ffmpeg: preserve NULL ptrs in get_buffer()Michael Niedermayer2012-05-02
| | | | | | | | | | | | Fixes Ticket1260, Ticket1267 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>