summaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | ffmpeg: re-set frame_size after filter graph reset.Nicolas George2012-06-301-4/+14
| | | | | | | | | | The filter contexts are completely cleared, so the frame size can not be kept.
* | ffmpeg: use the more powerful version of abuffersink.Nicolas George2012-06-301-10/+7
| |
* | ffmpeg: fix parsing of -force_key_frames option.Nicolas George2012-06-301-1/+4
| | | | | | | | | | Identical to commit 4f6a1c9 by Reimar Döffinger, that was lost after the merge of 19ad567.
* | ffmpeg: fix a memleak in subtitles decoding.Clément Bœsch2012-06-291-1/+4
| |
* | ffmpeg: warn that -t does not work with -filter_complex.Nicolas George2012-06-281-0/+3
| |
* | ffmpeg: warn when -t is used for inputs.Nicolas George2012-06-281-2/+8
| | | | | | | | | | | | | | | | | | Using -t on an input already have surprising results. Furthermore, using it on an input or an output makes a real difference if there are speed-altering filters. Implementing -t for inputs will probably result in some behavour changes.
* | ffmpeg: dont copy creation_time as the destination file is not created at ↵Michael Niedermayer2012-06-281-0/+1
| | | | | | | | | | | | | | | | that time Fixes Ticket1439 Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-271-0/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: add an assert to silence an uninitialized variable warning. avconv: shut up an uninitialized variable warning. avfiltergraph: shut up uninitialized variable warning. af_join: initialize a variable to shut up gcc warning. amix: fix format specifier for AVFilterLink.sample_rate. lavfi: make filters less verbose. mpc8: read APE tags. lavr: x86: fix ff_conv_fltp_to_flt_6ch function prototypes libm: provide fallback definition for cbrtf() using powf() network: Don't redefine error codes if they already exist in errno.h configure: Check for sys/time.h network: Include unistd.h from network.h avconv: don't include vsrc_buffer.h, which doesn't exist anymore lavfi: reorder AVFilterLink fields. lavfi: reorder AVFilterContext fields. lavfi: reorder AVFilter fields. lavfi: reorder AVFilterBufferRef fields. lavfi: reorder AVFilterBuffer fields. Conflicts: configure libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_aspect.c libavfilter/vf_crop.c libavfilter/vf_drawbox.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vsrc_color.c libavformat/network.h libavutil/libm.h Merged-by: Michael Niedermayer <[email protected]>
* | Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'Michael Niedermayer2012-06-261-27/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a': lavfi: remove 'opaque' parameter from AVFilter.init() mov: do not try to read total disc/track number if data atom is too short. avconv: fix -force_key_frames dxva2_h264: fix signaling of mbaff frames x86: fft: elf64: fix PIC build Conflicts: ffmpeg.c libavcodec/v210dec.h libavfilter/asrc_anullsrc.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_overlay.c libavfilter/vsrc_color.c libavfilter/vsrc_testsrc.c Merged-by: Michael Niedermayer <[email protected]>
* | lavfi/avcodec: deprecate avfilter_fill_frame_from_*_buffer_ref APIStefano Sabatini2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | Deprecate functions: avfilter_fill_frame_from_buffer_ref avfilter_fill_frame_from_audio_buffer_ref avfilter_fill_frame_from_video_buffer_ref and schedule to drop them at the next API major bump. The function avfilter_copy_buf_props() should be used instead.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-241-26/+32
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: log: Only include unistd.h if configure found it ape: create audio stream before reading tags. mov: make a length variable larger. image2: Add "start_number" private option to the demuxer image2: Add "start_number" private option to the muxer avconv: remove a forgotten debugging printf. avconv: use more descriptive names for hardcoded filters. avconv: remove redundant handling of async. doc/filters: fix typo. h264: use asm cabac reader under a generic condition Conflicts: ffmpeg.c libavformat/img2dec.c libavformat/img2enc.c Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix indent of 1 lineMichael Niedermayer2012-06-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix FF_API_OLD_VSINK_API=0 caseMichael Niedermayer2012-06-241-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: fix mixup of old and new sinksMichael Niedermayer2012-06-241-6/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-221-3/+6
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: libspeexenc: add supported sample rates and channel layouts. Replace usleep() calls with av_usleep() lavu: add av_usleep() function utvideo: mark interlaced frames as such utvideo: Fix interlaced prediction for RGB utvideo. cosmetics: do not use full path for local headers lavu/file: include unistd.h only when available configure: check for unistd.h log: include unistd.h only when needed lavf: include libavutil/time.h instead of redeclaring av_gettime() Conflicts: configure doc/APIchanges ffmpeg.c ffplay.c libavcodec/utvideo.c libavutil/avutil.h Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: remove unused buffer_size in InputFile.Clément Bœsch2012-06-221-1/+0
| |
* | ffmpeg: print swr options in --help tooMichael Niedermayer2012-06-221-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-201-1/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: MS Screen 1 decoder aacdec: Fix popping channel layouts. av_gettime: support Win32 without gettimeofday() Use av_gettime() in various places Move av_gettime() to libavutil dct-test: use emms_c() from libavutil instead of duplicating it mov: fix operator precedence bug mathematics.h: remove a couple of math defines Remove unnecessary inclusions of [sys/]time.h lavf: remove unnecessary inclusions of unistd.h bfin: libswscale: add const where appropriate to fix warnings bfin: libswscale: remove unnecessary #includes udp: Properly check for invalid sockets tcp: Check the return value from getsockopt network: Use av_strerror for getting error messages udp: Properly print error from getnameinfo mmst: Use AVUNERROR() to convert error codes to the right range for strerror network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows rtmp: Reduce the number of idle posts sent by sleeping 50ms Conflicts: Changelog configure libavcodec/aacdec.c libavcodec/allcodecs.c libavcodec/avcodec.h libavcodec/dct-test.c libavcodec/version.h libavformat/riff.c libavformat/udp.c libavutil/Makefile libswscale/bfin/yuv2rgb_bfin.c Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg.c: count subtitles in total size.Nicolas George2012-06-181-3/+8
| | | | | | | | | | This avoids the "Output file is empty" warning with subtitles-only files.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-151-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Avoid C99 variable declarations within for statements. rtmp: Read and handle incoming packets while writing data doc: document THREAD_TYPE fate variable rtpdec: Don't require frames to start with a Mode A packet avconv: don't try to free threads that were not initialized. Conflicts: doc/fate.texi ffplay.c libavdevice/dv1394.h Merged-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-131-6/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: rtmp: Add a new option 'rtmp_buffer', for setting the client buffer time rtmp: Set the client buffer time to 3s instead of 0.26s rtmp: Handle server bandwidth packets rtmp: Display a verbose message when an unknown packet type is received lavfi/audio: use av_samples_copy() instead of custom code. configure: add all filters hardcoded into avconv to avconv_deps avfiltergraph: remove a redundant call to avfilter_get_by_name(). lavfi: allow building without swscale. build: Do not delete tests/vsynth2 directory, which is no longer created. lavfi: replace AVFilterContext.input/output_count with nb_inputs/outputs lavfi: make AVFilterPad opaque after two major bumps. lavfi: add avfilter_pad_get_type() and avfilter_pad_get_name(). lavfi: make avfilter_get_video_buffer() private on next bump. jack: update to new latency range API as the old one has been deprecated rtmp: Tokenize the AMF connection parameters manually instead of using strtok_r ppc: Rename H.264 optimization template file for consistency. lavfi: add channelsplit audio filter. golomb: check remaining bits during unary decoding in get_ur_golomb_jpegls() sws: fix planar RGB input conversions for 9/10/16 bpp. Conflicts: Changelog configure doc/APIchanges ffmpeg.c libavcodec/golomb.h libavcodec/v210dec.h libavfilter/Makefile libavfilter/allfilters.c libavfilter/asrc_anullsrc.c libavfilter/audio.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/avfiltergraph.c libavfilter/buffersrc.c libavfilter/formats.c libavfilter/version.h libavfilter/vf_frei0r.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/video.h libavfilter/vsrc_color.c libavformat/rtmpproto.c libswscale/input.c tests/Makefile Merged-by: Michael Niedermayer <[email protected]>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-06-121-13/+7
|\| | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avfilter: Log an error if avfilter fails to configure a link. avconv: support only native pthreads. rtmp: Fix a possible access to invalid memory location when the playpath is too short. Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <[email protected]>
* | ffmpeg: disable threading on mingw, it doesnt work due to dependance on ↵Michael Niedermayer2012-06-111-1/+3
| | | | | | | | | | | | internal code. Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: allow overriding framerate for stream copyMichael Niedermayer2012-06-111-7/+12
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | ffmpeg: fix fate breakage introduced by key=value buffersrc args.Michael Niedermayer2012-06-091-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: avoid a confusing and easy to break if().Reimar Döffinger2012-06-061-2/+3
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
* | ffmpeg: fix memleakMichael Niedermayer2012-06-011-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | ffmpeg: allow overriding input top field firstMichael Niedermayer2012-05-311-0/+7
| | | | | | | | Signed-off-by: Michael Niedermayer <[email protected]>
* | 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 <[email protected]>
* | 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 <[email protected]>
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-21 17:53:36 +0000