summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-101-2/+156
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libmp3lame: add missing layout terminator avconv: multithreaded demuxing. Bump lavu minor and add an APIChanges entry for audioconvert functions. audioconvert: add a function for extracting the channel with the given index audioconvert: add a function for getting the name of a single channel. audioconvert: add a function for getting channel's index in layout audioconvert: use av_popcount64 in av_get_channel_layout_nb_channels vf_libopencv: add missing headers. iac: add missing dependency Conflicts: configure doc/APIchanges ffmpeg.c libavcodec/libmp3lame.c libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix fate breakage introduced by key=value buffersrc args.Michael Niedermayer2012-06-091-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: with filter_complex, avoid random in<->out mapping.Nicolas George2012-06-091-10/+0
| | | | | | | | | | | | | | | | | | | | With complex filters, an output can come from any input, or several inputs, including inputs of a different type. Copying the codec parameters from the first input with the same type does not make any sense. This does not change anything for simple 1->1 filters, as source_index is set in that case.
* | ffmpeg: init icodec.Nicolas George2012-06-091-1/+1
| | | | | | | | | | With complex filter graphs, it can end up accessed without having been set.
* | ffmpeg: use the frame rate computed by lavfi.Nicolas George2012-06-091-0/+2
| | | | | | | | | | This frame rate is more reliable than the one copied from the input stream, so it is used in priority.
* | ffmpeg: add frame rate to the buffersrc arguments.Nicolas George2012-06-091-3/+10
| | | | | | | | The arguments now use the key=value syntax.
* | ffmpeg.c: fix erroneous "Output file is empty" message.Mike Scheutzow2012-06-081-0/+1
| | | | | | | | | | | | | | | | | | This message is printed whenever the RAWVIDEO codec is used, whether the output file contains any frames or not. Test command: ./ffmpeg -i infile.y4m outfile.y4m Signed-off-by: Mike Scheutzow <mjs973@optonline.net> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move keyboard interaction in a function.Nicolas George2012-06-071-89/+95
| | | | | | | | | | It makes the transcode loop easier to read (30% less code) and the differences with avconv easier to spot.
* | ffmpeg: Set duration on encoded subtitle packets.Philip Langdale2012-06-061-0/+1
| | | | | | | | | | | | | | | | | | Currently, we don't set the duration on the packet of a newly encoded subtitle. This information may be required by the muxer. Signed-off-by: Philip Langdale <philipl@overt.org> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: avoid a confusing and easy to break if().Reimar Döffinger2012-06-061-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use isatty() before messing with the terminal stateMichael Niedermayer2012-06-061-1/+3
| | | | | | | | | | | | | | This fixes terminal messup in case of crashes (like in make fate) Reviewed-by: François Revol <revol@free.fr> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-061-154/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: vorbis: Validate that the floor 1 X values contain no duplicates. avprobe: Identify codec probe failures rather than calling them unsupported codecs. avformat: Probe codecs at score 0 on buffer exhaustion conditions. avformat: Factorize codec probing. Indeo Audio decoder imc: make IMDCT support stereo output imc: move channel-specific data into separate context lavfi: remove request/poll and drawing functions from public API on next bump lavfi: make avfilter_insert_pad and pals private on next bump. lavfi: make formats API private on next bump. avplay: use buffersrc instead of custom input filter. avtools: move buffer management code from avconv to cmdutils. avconv: don't use InputStream in the buffer management code. avconv: fix exiting when max frames is reached. mpc8: fix maximum bands handling aacdec: Turn PS off when switching to stereo and turn it to implicit when switching to mono. Conflicts: Changelog cmdutils.h ffmpeg.c ffplay.c ffprobe.c libavcodec/avcodec.h libavcodec/mpc8.c libavcodec/v210dec.h libavcodec/version.h libavcodec/vorbisdec.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_blackframe.c libavfilter/vf_boxblur.c libavfilter/vf_crop.c libavfilter/vf_cropdetect.c libavfilter/vf_delogo.c libavfilter/vf_drawbox.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_fifo.c libavfilter/vf_format.c libavfilter/vf_frei0r.c libavfilter/vf_gradfun.c libavfilter/vf_hflip.c libavfilter/vf_hqdn3d.c libavfilter/vf_libopencv.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_select.c libavfilter/vf_showinfo.c libavfilter/vf_transpose.c libavfilter/vf_unsharp.c libavfilter/vf_yadif.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-041-38/+59
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: movenc: Write chan atom for all audio tracks in mov mode movies. mpegtsenc: use avio_open_dyn_buf(), zero pointers after freeing doc/avconv: add some details about the transcoding process. avidec: make scale and rate unsigned. avconv: check output stream recording time before each frame returned from filters avconv: split selecting input file out of transcode(). avconv: split checking for active outputs out of transcode(). avfiltergraph: make some functions static. Conflicts: ffmpeg.c libavfilter/avfiltergraph.c libavfilter/internal.h libavformat/mpegtsenc.c tests/ref/fate/acodec-alac tests/ref/fate/acodec-pcm-s16be tests/ref/fate/acodec-pcm-s24be tests/ref/fate/acodec-pcm-s32be tests/ref/fate/acodec-pcm-s8 tests/ref/lavf/mov Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove two unused variables.Clément Bœsch2012-06-041-2/+1
| |
* | ffmpeg: disable audio volume insertion on the output side.Michael Niedermayer2012-06-041-1/+1
| | | | | | | | | | | | This fixes -vol leading to 2 inserted volume filters Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: add missing return carriage in error message.Clément Bœsch2012-06-041-1/+1
| |
* | timecode: move timecode muxer options to metadata.Clément Bœsch2012-06-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Some demuxers set a timecode in the format or streams metadata. The muxers now make use of this metadata instead of a duplicated private option. This makes possible transparent copy of the timecode when transmuxing and transcoding. -timecode option for MPEG1/2 codec is also renamed to -gop_timecode. The global ffmpeg -timecode option will set it anyway so no option change visible for the user.
* | ffmpeg: be more verbose when printing an error in transcode()Stefano Sabatini2012-06-041-3/+5
| | | | | | | | Helps debuggability.
* | ffmpeg: specify more meaningful names for the lavfi buffer sourcesStefano Sabatini2012-06-041-3/+3
| |
* | ffmpeg: use filter time base as codec time base.Nicolas George2012-06-031-0/+2
| |
* | ffmpeg: avoid NULL dereference with filters.Nicolas George2012-06-031-1/+2
| | | | | | | | | | icodec can be NULL if there is no input stream clearly associated with the output stream.
* | ffmpeg: move pan filter insertion up.Michael Niedermayer2012-06-011-34/+33
| | | | | | | | | | | | | | This fixes one (disabled) fate test. Thanks-to: ubitux to pointing at the odd filter order and stereo/mono messup Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix memleakMichael Niedermayer2012-06-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: allow overriding input top field firstMichael Niedermayer2012-05-311-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: disable autoinsertion for -async on the output side of the filtergraph.Michael Niedermayer2012-05-301-1/+1
| | | | | | | | | | | | | | | | | | This fixes the issue that since the last merge -async caused 2 aresample filters to be inserted users that generate funny timestamps in a filtergraph should probably manually insert a aresample filter where they need it. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-301-354/+285
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: extend -r to work on any input stream. doc/avconv: expand documentation for the -s option. avconv: don't print filters inserted by avconv in stream mappings. avconv: merge configuration code for complex and simple filters avconv: split configuring input filters out of configure_complex_filter Conflicts: configure doc/ffmpeg.texi ffmpeg.c tests/ref/fate/idroq-video-encode Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use %f instead of %lf in volume args format printf.Clément Bœsch2012-05-281-1/+1
| | | | | | | | %f refers to a double argument already.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-261-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: opt: Add av_opt_set_bin() avconv: Display the error returned by avformat_write_header rtpenc_chain: Return an error code instead of just a plain pointer rtpenc_chain: Free the URLContext on failure rtpenc: Expose the ssrc as an avoption avprobe: display the codec profile in show_stream() avprobe: fix function prototype cosmetics: Fix indentation avprobe: changelog entry avprobe: update documentation avprobe: provide JSON output avprobe: output proper INI format avprobe: improve formatting rtmp: fix url parsing fate: document TARGET_EXEC and its usage Conflicts: doc/APIchanges doc/fate.texi doc/ffprobe.texi ffprobe.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: use AUTO_INSERT_FILTER() for -async option.Clément Bœsch2012-05-241-23/+9
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-231-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2 http: Add support for reading http POST reply headers http: Add http_shutdown() for ending writing of posts tcp: Allow signalling end of reading/writing avio: Add a function for signalling end of reading/writing lavfi: fix comment, audio is supported now. lavfi: fix incorrect comment. lavfi: remove avfilter_null_* from public API on next bump. lavfi: remove avfilter_default_* from public API on next bump. lavfi: deprecate default config_props() callback and refactor avfilter_config_links() avfiltergraph: smarter sample format selection. avconv: rename transcode_audio/video to decode_audio/video. asyncts: reset delta to 0 when it's not used. x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code. dwt: return errors from ff_slice_buffer_init() Conflicts: ffmpeg.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/formats.c libavfilter/version.h libavfilter/vf_blackframe.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_showinfo.c libavfilter/video.c libavfilter/video.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: fix a crash with complex filters when pix_fmt is not specifiedMatthieu Bouron2012-05-201-1/+1
| | | | | | | | | | | | | | 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-201-15/+8
| | | | | | | | | | 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-201-1/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: change AVFMT_RAWPICTURE pts to reduce diff to qatarMichael Niedermayer2012-05-201-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: random cosmectics to reduce diff to qatarMichael Niedermayer2012-05-201-6/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: cosmetics to reduce difference to qatar by 101 linesMichael Niedermayer2012-05-201-43/+44
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: cosmetics to reduce difference to qatar by about 90 linesMichael Niedermayer2012-05-201-79/+82
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: move ost->frame_rate setting code before the filtergraph stuffMichael Niedermayer2012-05-201-6/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: drop pkt_ptsMichael Niedermayer2012-05-201-7/+2
| | | | | | | | | | | | | | 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-201-5/+6
| | | | | | | | | | Inspired-by a change from Anton Khirnov Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: reintroducing check_recording_time()Michael Niedermayer2012-05-201-12/+15
| | | | | | | | | | | | | | 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-201-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '755cd4197d53946208e042f095b930dca18d9430'Michael Niedermayer2012-05-191-13/+133
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-0/+23
| | | | | | | | | | | | Based on similar code from anton Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: misc cosmetics.Clément Bœsch2012-05-191-15/+14
| | | | | | | | | | 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-191-27/+4
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-191-2/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-5/+1
| | | | | | | | | | Found-by: ubitux Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: remove unused variable i.Clément Bœsch2012-05-181-1/+0
| |
* | ffmpeg: do not deprecate -vol and -map_channel.Clément Bœsch2012-05-181-3/+2
| | | | | | | | These helpers are handy, just notice the user it is done using lavfi.
OpenPOWER on IntegriCloud