aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
...
| * ffmpeg: initialise encoders earlier.Anton Khirnov2011-06-161-6/+6
| | | | | | | | Fixes choosing supported samplerate and framerate.
* | Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'Michael Niedermayer2011-06-171-11/+7
|\| | | | | | | | | | | | | | | | | | | | | * commit '9446d75941d639f19cfa9ae007eb4c5ca041f200': ffmpeg: merge output_codecs array into AVOutputStream members. rtpenc_latm: Consistently use "Libav" in license boilerplate. rtsp: Don't pass string pointer as format string to ff_url_join mmsh: fixed printf injection bug in mmsh request codec-regression: remove pointless -r options for dnxhd Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: merge output_codecs array into AVOutputStream members.Anton Khirnov2011-06-161-11/+7
| | | | | | | | There's no point in keeping them separate.
* | ffmpeg: Force 420 with target dvd and svcd.Michael Niedermayer2011-06-161-0/+2
| | | | | | | | | | | | Fixes ticket283 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-161-26/+35
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. Conflicts: ffmpeg.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: don't abuse a global for passing framerate from input to outputAnton Khirnov2011-06-151-9/+13
| | | | | | | | It's broken with multiple files or video streams.
| * ffmpeg: don't abuse a global for passing channels from input to outputAnton Khirnov2011-06-151-6/+9
| | | | | | | | It's broken with multiple files or audio streams.
| * ffmpeg: don't abuse a global for passing samplerate from input to outputAnton Khirnov2011-06-151-11/+13
| | | | | | | | | | | | | | It's broken with multiple files or audio streams. This removes the default samplerate of 44100 for raw input, hence all the FATE changes.
| * ffmpeg: fix streaming to ffserver.Ronald S. Bultje2011-06-141-0/+1
| |
| * ffmpeg.c: Add a necessary const qualifierAlex Converse2011-06-091-1/+1
| |
* | avfiltergraph: make the AVFilterInOut alloc/free API publicStefano Sabatini2011-06-121-2/+2
| | | | | | | | | | This is required for letting applications to create and destroy AVFilterInOut structs in a convenient way.
* | avfiltergraph: change the syntax of avfilter_graph_parse()Stefano Sabatini2011-06-121-1/+1
| | | | | | | | | | | | | | Make it returns the list of open inputs and outputs, so it can be reused by applications. Breaks API/ABI.
* | Fix -t option for formats which holds dts and no ptsEtienne Buira2011-06-111-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-091-14/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: crypto: Use av_freep instead of av_free lavf: don't try to free private options if priv_data is NULL. swscale: fix types of assembly arguments. swscale: move two macros that are only used once into caller. swscale: remove unused function. options: Add missing braces around struct initializer. mov: Remove leftover crufty debug statement with references to a local file. dvbsubdec: Fix compilation of debug code. Remove all uses of now deprecated metadata functions. Move metadata API from lavf to lavu. Conflicts: doc/APIchanges libavformat/aiffdec.c libavformat/asfdec.c libavformat/avformat.h libavformat/avidec.c libavformat/cafdec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/mp3enc.c libavformat/wtv.c libavutil/avutil.h libavutil/internal.h libswscale/swscale.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove all uses of now deprecated metadata functions.Anton Khirnov2011-06-081-14/+15
| |
* | Move code for "ffmpeg: fix massive leak occurring when seeking" / ↵Michael Niedermayer2011-06-061-8/+16
| | | | | | | | | | | | | | | | e4841a404bdabfeafb917454d510b60d888cb761 elsewhere The picture struct is written to in the loop, so this cannot work. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | vsrc_buffer: add flags param to av_vsrc_buffer_add_video_buffer_refStefano Sabatini2011-06-061-1/+2
| | | | | | | | | | | | | | The new flags parameter allows to specify if the video ref to add should overwrite the cache, if the flag is not set vsrc_buffer will complain and abort; otherwise it will clean the already cached video ref before to overwrite it, thus avoiding a leak.
* | ffmpeg: fix massive leak occurring when seekingStefano Sabatini2011-06-051-15/+7
| | | | | | | | | | | | | | | | | | Avoid to add frames to the vsrc_buffer in the case ist->pts < start_time, as these frames are unused (and never released). In particular this condition is verified with commands of the kind: ffmpeg -i INPUT -ss TIME OUTPUT Also allow a minor simplification.
* | cmdutils: change the signature of the function argument in parse_options()Stefano Sabatini2011-06-051-1/+2
| | | | | | | | This is required for a pending simplification.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-041-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (21 commits) build: simplify commands for clean target swscale: split swscale.c in unscaled and generic conversion routines. swscale: cosmetics. swscale: integrate (literally) swscale_template.c in swscale.c. swscale: split out x86/swscale_template.c from swscale.c. swscale: enable hScale_altivec_real. swscale: split out ppc _template.c files from main swscale.c. swscale: remove indirections in ppc/swscale_template.c. swscale: split out unscaled altivec YUV converters in their own file. mpegvideoenc: fix multislice fate tests with threading disabled. mpegts: Wrap #ifdef DEBUG and av_hex_dump_log() combination in a macro. build: Simplify texi2html invocation through the --output option. Mark some variables with av_unused Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name(). svq3: Check negative mb_type to fix potential crash. svq3: Move svq3-specific fields to their own context. rawdec: initialize return value to 0. Remove unused get_psnr() prototype rawdec: don't leak option strings. bktr: get default framerate from video standard. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace avcodec_get_pix_fmt_name() by av_get_pix_fmt_name().Stefano Sabatini2011-06-031-2/+2
| | | | | | | | | | This fixes warnings about avcodec_get_pix_fmt_name() being deprecated. Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | ffmpeg: use opt_acodec when setting audio codec in opt_target.Baptiste Coudurier2011-06-031-2/+2
| |
* | ffmpeg: fix segfault with too many output filesMichael Niedermayer2011-06-041-0/+5
| | | | | | | | | | | | Fixes Ticket219 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-031-3/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (25 commits) Replace custom DEBUG preprocessor trickery by the standard one. vorbis: Remove non-compiling debug statement. vorbis: Remove pointless DEBUG #ifdef around debug output macros. cook: Remove non-compiling debug output. Remove pointless #ifdefs around function declarations in a header. Replace #ifdef + av_log() combinations by av_dlog(). Replace custom debug output functions by av_dlog(). cook: Remove unused debug functions. Remove stray extra arguments from av_dlog() invocations. targa: fix big-endian build v4l2: remove one forgotten use of AVFormatParameters.pix_fmt. vfwcap: add a framerate private option. v4l2: add a framerate private option. libdc1394: add a framerate private option. fbdev: add a framerate private option. bktr: add a framerate private option. oma: check avio_read() return value nutdec: remove unused variable Remove unused variables swscale: allocate larger buffer to handle altivec overreads. ... Conflicts: ffmpeg.c libavcodec/dca.c libavcodec/dirac.c libavcodec/error_resilience.c libavcodec/h264.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pthread.c libavcodec/rv10.c libavcodec/s302m.c libavcodec/shorten.c libavcodec/truemotion2.c libavcodec/utils.c libavdevice/dv1394.c libavdevice/fbdev.c libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/4xm.c libavformat/apetag.c libavformat/asfdec.c libavformat/avidec.c libavformat/mmf.c libavformat/mpeg.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/oggdec.c libavformat/oggparseogm.c libavformat/rl2.c libavformat/rmdec.c libavformat/rpl.c libavformat/rtpdec_latm.c libavformat/sauce.c libavformat/sol.c libswscale/utils.c tests/ref/vsynth1/error tests/ref/vsynth2/error Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Remove unused variablesMans Rullgard2011-06-021-5/+3
| |
* | In print_report, print progression time in hours:mins:secs:usBaptiste Coudurier2011-06-031-2/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: In print_report, use int64_t for pts to check for 0 and avoid inf ↵Baptiste Coudurier2011-06-031-9/+6
| | | | | | | | | | | | value for bitrate. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ffmpeg: handle copy of packets for AVFMT_RAWPICTURE output formatsStefano Sabatini2011-06-011-0/+8
| | | | | | | | | | | | Store AVPicture in AVPacket as required by AVFMT_RAWPICTURE formats. Fix trac issue #251.
* | ffmpeg: simplify opt_*_codec() optionsStefano Sabatini2011-05-301-40/+23
| | | | | | | | | | Replace opt_{audio,video,subtitle,data}_codec() with a single opt_codec() function.
* | Fix various unused variable warningsClément Bœsch2011-05-301-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Remove now unused nb_istreams variable.Reimar Döffinger2011-05-291-1/+1
| |
* | Merge remote-tracking branch 'qatar/master' into masterMichael Niedermayer2011-05-291-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) ac3enc: fix LOCAL_ALIGNED usage in count_mantissa_bits() ac3dsp: do not use the ff_* prefix when referencing ff_ac3_bap_bits. ac3dsp: fix loop condition in ac3_update_bap_counts_c() ARM: unbreak build ac3enc: modify mantissa bit counting to keep bap counts for all values of bap instead of just 0 to 4. ac3enc: split mantissa bit counting into a separate function. ac3enc: store per-block/channel bap pointers by reference block in a 2D array rather than in the AC3Block struct. get_bits: add av_unused tag to cache variable sws: replace all long with int. ARM: aacdec: fix constraints on inline asm ARM: remove unnecessary volatile from inline asm ARM: add "cc" clobbers to inline asm where needed ARM: improve FASTDIV asm ac3enc: use LOCAL_ALIGNED macro APIchanges: fill in git hash for av_get_pix_fmt_name (0420bd7). lavu: add av_get_pix_fmt_name() convenience function cmdutils: remove OPT_FUNC2 swscale: fix crash in bilinear scaling. vpxenc: add VP8E_SET_STATIC_THRESHOLD mapping webm: support stereo videos in matroska/webm muxer ... Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges doc/muxers.texi ffmpeg.c ffplay.c libavcodec/ac3enc.c libavcodec/ac3enc_float.c libavcodec/avcodec.h libavcodec/get_bits.h libavcodec/libvpxenc.c libavcodec/version.h libavdevice/libdc1394.c libavformat/matroskaenc.c libavutil/avutil.h libswscale/rgb2rgb.c libswscale/swscale.c libswscale/swscale_template.c libswscale/x86/swscale_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-281-100/+115
| | | | | | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | cmdutils: remove OPT_FUNC2Stefano Sabatini2011-05-281-100/+115
| | | | | | | | | | | | | | Make ff* tools only accept opt_* functions taking two arguments. The distinction between functions with one and two arguments is quite pointless. Simplify parse_options() code.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) ARM: add ARMv6 optimised av_clip_uintp2 ARM: remove volatile from asm statements in libavutil/intmath ARM: fix av_clipl_int32_arm() v4l: include avdevice.h ffserver: move close_connection() call to avoid a temporary string and copy. lavf: initialize demuxer private options. AVOptions: set string default values. lavdevice: mark v4l for removal on next major bump. swscale: fix compile on ppc. swscale: fix compile on x86-32. build: Remove generated .version file on distclean. configure: Add -D_GNU_SOURCE to CPPFLAGS on OS/2. doc: Drop hint at --enable-memalign-hack for MinGW, it is now autodetected. ffplay: Remove disabled code. Mark parameterless function declarations as 'void'. swscale: use av_clip_uint8() in yuv2yuv1_c(). swscale: remove VOF/VOFW. swscale: split chroma buffers into separate U/V planes. swscale: replace formatConvBuffer[VOF] by allocated array. rgb2rgb: remove duplicate mmx/mmx2/3dnow/sse2 functions. ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffserver: Fix a null pointer dereference as a result of the ↵Mike Williams2011-05-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FF_API_MAX_STREAMS cleanup. Fixed another dereference in the RTSP code. Removed a useless variable. Changed an unnecessary looping assignment to a simple assignment suggested by Maksym. Added fixes and tweaks suggested by Maksym Veremeyenko [verem@m1stereo.tv] and Clément B.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-261-113/+81
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) doc: create separate section for audio encoders swscale: Remove orphaned, commented-out function declaration. swscale: Eliminate rgb24toyv12_c() duplication. Remove h263_msmpeg4 from MpegEncContext. APIchanges: Fill in git hash for fps_probe_size (30315a8) avformat: Add fpsprobesize as an AVOption. avoptions: Return explicitly NAN or {0,0} if the option isn't found rtmp: Reindent rtmp: Don't try to do av_malloc(0) tty: replace AVFormatParameters.sample_rate abuse with a private option. Fix end time of last chapter in compute_chapters_end ffmpeg: get rid of useless AVInputStream.nb_streams. ffmpeg: simplify managing input files and streams ffmpeg: purge redundant AVInputStream.index. lavf: deprecate AVFormatParameters.channel. libdc1394: add a private option for channel. dv1394: add a private option for channel. v4l2: reindent. v4l2: add a private option for channel. lavf: deprecate AVFormatParameters.standard. ... Conflicts: doc/APIchanges doc/encoders.texi ffmpeg.c libavdevice/alsa-audio.h libavformat/version.h libavutil/opt.c libswscale/rgb2rgb.h libswscale/rgb2rgb_template.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: get rid of useless AVInputStream.nb_streams.Anton Khirnov2011-05-251-5/+3
| | | | | | | | It's a duplicate of AVFormatContext.nb_streams.
| * ffmpeg: simplify managing input files and streamsAnton Khirnov2011-05-251-95/+68
| | | | | | | | | | | | Grow the file and stream list in opt_input_file() instead of creating it all at once in transcode(). This is simpler and will be useful for following commits.
| * ffmpeg: purge redundant AVInputStream.index.Anton Khirnov2011-05-251-10/+8
| | | | | | | | AVStream.index stores the same thing.
| * ffmpeg: Don't trigger url_interrupt_cb on the first signalMartin Storsjö2011-05-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, the url_interrupt_cb callback will abort all IO after the first received signal. This makes the output files from e.g. the mov muxer to be unreadable if the transcode is aborted with ctrl+c. After this patch, the first signal cleanly breaks out of the transcoding loop, but won't forcibly abort all IO. After the second signal is received, the url_interrupt_cb callback will abort all IO. Signed-off-by: Martin Storsjö <martin@martin.st>
* | ffmpeg: handle the case when get_filtered_frame() failsStefano Sabatini2011-05-251-1/+2
| |
* | lavf: deprecate avformat_alloc_output_context() in favor of ↵Stefano Sabatini2011-05-221-2/+2
| | | | | | | | | | | | | | | | avformat_alloc_output_context2() The new function accepts a slightly more intuitive order of paramters, and returns an error code, thus allowing applications to report a meaningful error message.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-05-221-8/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: ffmpeg: get rid of the -vglobal option. dct32: Add AVX implementation of 32-point DCT dct32: Change pass 6 permutation to allow for AVX implementation dct32: port SSE 32-point DCT to YASM multiple inclusion guard cleanup avio: document buffer must created with av_malloc() and friends avio: check AVIOContext malloc failure swscale: point out an alternative to sws_getContext svq3: Do initialization after parsing the extradata add changelog entries for 0.7_beta2 mp3lame: add #include required for AV_RB32 macro. Conflicts: Changelog libavcodec/svq3.c libavcodec/x86/dct32_sse.c libavfilter/vsrc_buffer.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * ffmpeg: get rid of the -vglobal option.Anton Khirnov2011-05-211-8/+1
| | | | | | | | | | It's badly documented and does the same thing as -flags global_header, so it's redundant.
| * Add support for request_sample_format in ffmpeg and ffplay.Justin Ruggles2011-05-181-2/+70
| |
* | ffserver: dont just crashMike William2011-05-211-0/+2
| | | | | | | | With changes from ubitux.
* | fix ffserver's SIGSEGVMaksym Veremeyenko2011-05-211-0/+1
| |
* | ffmpeg: remove useless NULL-check on avfilter_unref_bufferStefano Sabatini2011-05-201-2/+1
| | | | | | | | | | | | The check is no more required since recent changes in the avfilter_unref_buffer(), the check is done in the function. Simplify.
* | vsrc_buffer: add av_vsrc_buffer_add_frame()Stefano Sabatini2011-05-191-6/+1
| | | | | | | | | | | | The new function is a wrapper around av_vsrc_buffer_add_video_buffer_ref(), and allows to simplify the act of pushing AVFrame data to the source buffer.
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-13 23:57:37 +0000