summaryrefslogtreecommitdiff
path: root/cmdutils.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-181-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: make compare() function compatible with POSIX bc Update Janne's email address. APIchanges: Replace Subversion revision numbers by Git hashes. bytestream: Eliminate one level of pointless macro indirection. xwd: convert to bytestream2. vqavideo: port to bytestream2 API Read preset files with suffix .avpreset prores: allow user to set fixed quantiser lavf: remove some disabled code. lavf: only set average frame rate for video. lavf: remove a pointless check. avcodec: add XBM encoder Conflicts: Changelog cmdutils.c cmdutils.h doc/APIchanges libavcodec/Makefile libavcodec/avcodec.h libavcodec/version.h libavcodec/vqavideo.c libavformat/img2enc.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Read preset files with suffix .avpresetReinhard Tartler2012-03-181-2/+2
| | | | | | | | | | | | The preset files have been renamed some time ago. CC: libav-stable@libav.org
* | cmdutils: Fix cpuflags so the flags dont pull in and out other flags.Michael Niedermayer2012-03-141-28/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Note, this doesnt break compatibility with libav, as libav has implemented a incompatible and more limited system under the same -cpuflags command line option we used since some time. The differences to libav for example are we can do things like ffmpeg -cpuflags -sse+mmx -cpuflags +3dnow Its also possible in our system to force flags that have not been detected as available And our -cpuflags works with all tools not just 1 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-071-11/+49
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: SBR DSP: fix SSE code to not use SSE2 instructions. cpu: initialize mask to -1, so that by default, optimizations are used. error_resilience: initialize s->block_index[]. svq3: protect against negative quantizers. Don't use ff_cropTbl[] for IDCT. swscale: make filterPos 32bit. FATE: add CPUFLAGS variable, mapping to -cpuflags avconv option. avconv: add -cpuflags option for setting supported cpuflags. cpu: add av_set_cpu_flags_mask(). libx264: Allow overriding the sliced threads option avconv: fix counting encoded video size. Conflicts: doc/APIchanges doc/fate.texi doc/ffmpeg.texi ffmpeg.c libavcodec/h264idct_template.c libavcodec/svq3.c libavutil/avutil.h libavutil/cpu.c libavutil/cpu.h libswscale/swscale.c tests/Makefile tests/fate-run.sh tests/regression-funcs.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avconv: add -cpuflags option for setting supported cpuflags.Anton Khirnov2012-03-061-5/+2
| | | | | | | | Useful for testing.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-051-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (27 commits) cmdutils: use new avcodec_is_decoder/encoder() functions. lavc: make codec_is_decoder/encoder() public. lavc: deprecate AVCodecContext.sub_id. libcdio: add a forgotten AVClass to the private context. swscale: remove "cpu flags" from -sws_flags description. proresenc: give user a possibility to alter some encoding parameters vorbisenc: add output buffer overwrite protection libopencore-amrnbenc: fix end-of-stream handling ra144enc: fix end-of-stream handling nellymoserenc: zero any leftover packet bytes nellymoserenc: use proper MDCT overlap delay qpeg: Use bytestream2 functions to prevent buffer overreads. swscale: make %rep unconditional. vp8: convert simple loopfilter x86 assembly to use named arguments. vp8: convert idct x86 assembly to use named arguments. vp8: convert mc x86 assembly to use named arguments. vp8: convert loopfilter x86 assembly to use cpuflags(). vp8: convert idct/mc x86 assembly to use cpuflags(). swscale: remove now unnecessary hack. x86inc: don't "bake" stack_offset in named arguments. ... Conflicts: cmdutils.c doc/APIchanges libavcodec/mpeg12.c libavcodec/options.c libavcodec/qpeg.c libavcodec/utils.c libavcodec/version.h libavdevice/libcdio.c tests/lavf-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: use new avcodec_is_decoder/encoder() functions.Anton Khirnov2012-03-041-2/+2
| | | | | | | | Fixes listing encoders.
| * Remove libpostproc.Diego Biurrun2012-02-231-6/+0
| | | | | | | | | | | | | | | | This library does not fit into Libav as a whole and its code is just a maintenance burden. Furthermore it is now available as an external project, which completely obviates any reason to keep it around. URL: http://git.videolan.org/?p=libpostproc.git
| * cmdutils: update copyright year to 2012.Ronald S. Bultje2012-02-081-1/+1
| |
* | cmdutils: add -cpuflags.Michael Niedermayer2012-02-191-0/+13
| | | | | | | | | | | | | | This allows globally forcing specific cpuflags (or lack thereof) Useful for debugging and benchmarking Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Fix ffmpeg -codecs output.Carl Eugen Hoyos2012-02-171-1/+1
| |
* | cmdutils: re-add return 0 accidentally remove from opt_protocols().Clément Bœsch2012-01-281-0/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-281-17/+10
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (71 commits) movenc: Allow writing to a non-seekable output if using empty moov movenc: Support adding isml (smooth streaming live) metadata libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set sunrast: Document the different Sun Raster file format types. sunrast: Add a check for experimental type. libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat lavf: remove disabled FF_API_SET_PTS_INFO cruft lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft lavf: remove disabled FF_API_REORDER_PRIVATE cruft lavf: remove disabled FF_API_SEEK_PUBLIC cruft lavf: remove disabled FF_API_STREAM_COPY cruft lavf: remove disabled FF_API_PRELOAD cruft lavf: remove disabled FF_API_NEW_STREAM cruft lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft lavf: remove disabled FF_API_MUXRATE cruft lavf: remove disabled FF_API_FILESIZE cruft lavf: remove disabled FF_API_TIMESTAMP cruft lavf: remove disabled FF_API_LOOP_OUTPUT cruft lavf: remove disabled FF_API_LOOP_INPUT cruft lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft ... Conflicts: doc/APIchanges libavcodec/8bps.c libavcodec/avcodec.h libavcodec/libx264.c libavcodec/mjpegbdec.c libavcodec/options.c libavcodec/sunrast.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/h264_deblock.asm libavdevice/libdc1394.c libavdevice/v4l2.c libavformat/avformat.h libavformat/avio.c libavformat/avio.h libavformat/aviobuf.c libavformat/dv.c libavformat/mov.c libavformat/utils.c libavformat/version.h libavformat/wtv.c libavutil/Makefile libavutil/file.c libswscale/x86/input.asm libswscale/x86/swscale_mmx.c libswscale/x86/swscale_template.c tests/ref/lavf/ffm Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: fix options starting with 'no'.Alexandra Khirnova2012-01-271-4/+2
| | | | | | | | | | | | E.g. non_linear_quant mpeg2video private option. Signed-off-by: Anton Khirnov <anton@khirnov.net>
| * Drop unnecessary prefix from *sink* variable and struct names.Diego Biurrun2012-01-251-10/+10
| |
| * cosmetics: Rename ffsink to avsink.Diego Biurrun2012-01-191-10/+10
| |
* | cmdutils: include type in filter list.Nicolas George2012-01-191-2/+22
| |
* | cmdutils: media type to letter conversion in a separate function.Nicolas George2012-01-191-17/+14
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-121-0/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fft: init functions with INIT_XMM/YMM. pcmenc: set frame_size to 0. gsm demuxer: use generic seeking instead of a gsm-specific function. gsm demuxer: return packets with only 1 gsm block at a time. avcodec: add GSM parser doc: Replace ffmpeg references in avserver config file by avconv. doc: Fix names of av_log color environment variables. Fix a bunch of platform name and other typos. Add some missing changelog entries and release 0.8_beta2 No longer build libpostproc by default wtv: fix memleaks during normal operation threads: add CODEC_CAP_AUTO_THREADS for libvpx and xavs Conflicts: Changelog RELEASE cmdutils.c configure doc/ffserver.conf doc/platform.texi ffplay.c libavcodec/Makefile libavcodec/version.h libavformat/wtv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * No longer build libpostproc by defaultReinhard Tartler2012-01-111-0/+4
| | | | | | | | | | | | | | update documentation to inform developers that it may be removed in a later release. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
* | cmdutils: make this_year extern, so it can be referenced from other .o filesStefano Sabatini2012-01-071-1/+1
| | | | | | | | Required by a pending change in ffprobe.
* | cmdutils: add print_program_info() used in both show_banner() and show_version()Stefano Sabatini2012-01-061-7/+17
| | | | | | | | | | This also make -version show program configuration and compilation information, which was previously shown only in the banner.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-01-041-154/+187
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: add dxtory test adx_parser: rewrite. adxdec: Validate channel count to fix a division by zero. adxdec: Do not require extradata. cmdutils: K&R reformatting cosmetics alacdec: implement the 2-pass prediction type. alacenc: implement the 2-pass prediction type. alacenc: do not generate invalid multi-channel ALAC files alacdec: fill in missing or guessed info about the extradata format. utvideo: proper median prediction for interlaced videos lavu: bump lavu minor for av_popcount64 dca: K&R formatting cosmetics dct: K&R formatting cosmetics lavf: flush decoders in avformat_find_stream_info(). win32: detect number of CPUs using affinity Add av_popcount64 snow: Restore three mistakenly removed casts. Conflicts: cmdutils.c doc/APIchanges libavcodec/adx_parser.c libavcodec/adxdec.c libavcodec/alacenc.c libavutil/avutil.h tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: K&R reformatting cosmeticsAneesh Dogra2012-01-031-160/+196
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | Update copyright year.Carl Eugen Hoyos2012-01-011-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-12-311-2/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: fate: whitespace cosmetics fate: split off video codec FATE tests into their own file fate: split off audio codec FATE tests into their own file fate: split off Electronic Arts codec FATE tests into their own file fate: split off QuickTime codec FATE tests into their own file fate: split off voice codec FATE tests into their own file fate: split off demuxer FATE tests into their own file cosmetics: Drop unnecessary parentheses around return values. fate: drop pointless _audio and _video suffixes from xan tests qt-faststart: K&R reformatting; fix comment typos FATE: Add test for H.264 MP4->annex.B bitstream filter. Conflicts: ffplay.c tests/fate.mak tests/fate/h264.mak tests/fate/image.mak tests/fate/lossless-audio.mak tests/fate/lossless-video.mak tests/fate/qtrle.mak tests/fate/real.mak tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Drop unnecessary parentheses around return values.Diego Biurrun2011-12-301-2/+3
| |
| * lavc: add a sample_aspect_ratio field to AVFrameStefano Sabatini2011-12-251-0/+1
| | | | | | | | | | | | | | The sample aspect ratio is a per-frame property, so it makes sense to define it in AVFrame rather than in the codec/stream context. Simplify application-level sample aspect ratio information extraction, and allow further simplifications.
* | ff*: add -max_alloc command line optionMichael Niedermayer2011-12-251-0/+14
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: restore vertical alignment of versionsMichael Niedermayer2011-12-221-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | cmdutils: print swr versions tooMichael Niedermayer2011-12-221-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | ff*: Fix duplicatedly printed version info with -versionMichael Niedermayer2011-12-201-1/+5
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | fftools: add -report option.Nicolas George2011-12-101-0/+85
| |
* | cmdutils: pass AVCodec to filter_codec_opts()Michael Niedermayer2011-11-271-3/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | opt_pix_fmts: try to fix segfault on open solarisMichael Niedermayer2011-11-261-0/+2
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-231-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) aacdec: Fix PS in ADTS. avconv: Consistently use PIX_FMT_NONE. dsputil: use cpuflags in x86 emu_edge_core dsputil: use movups instead of movdqu in ff_emu_edge_core_sse() wma: initialize prev_block_len_bits, next_block_len_bits, and block_len_bits. mov: Remove some redundant and obsolete comments. Add libavutil/mathematics.h #includes for INFINITY doxy: structure libavformat groups doxy: introduce an empty structure in libavcodec doxy: provide a start page and document libavutil doxy: cleanup pixfmt.h regtest: split video encode/decode tests into individual targets ARM: add explicit .arch and .fpu directives to asm.S pthread: do not touch has_b_frames avconv: cleanup the transcoding loop in output_packet(). avconv: split subtitle transcoding out of output_packet(). avconv: split video transcoding out of output_packet(). avconv: split audio transcoding out of output_packet(). avconv: reindent. avconv: move streamcopy-only code out of decoding loop. ... Conflicts: avconv.c libavcodec/aaccoder.c libavcodec/pthread.c libavcodec/version.h libavutil/audioconvert.h libavutil/avutil.h libavutil/mem.h tests/ref/vsynth1/dv tests/ref/vsynth1/mpeg2thread tests/ref/vsynth2/dv tests/ref/vsynth2/mpeg2thread Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Add libavutil/mathematics.h #includes for INFINITYMans Rullgard2011-11-221-0/+1
| | | | | | | | | | | | This fixes build errors in some environments. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-11-011-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | * qatar/master: cmdutils: Rename read_file to cmdutils_read_file Conflicts: ffmpeg.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: Rename read_file to cmdutils_read_fileMartin Storsjö2011-10-311-1/+1
| | | | | | | | | | | | | | This symbol name clashes with a symbol in gnutls, if linking statically to that library. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-311-3/+15
|\ \ | |/ | | | | | | | | | | | | * qatar/master: libdirac/libschroedinger: Drop unnecessary symbol prefixes. cmdutils: check fread() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils: check fread() return valueJanne Grunau2011-10-301-3/+15
| |
* | cmdutils: Fix loglevel for -debugMichael Niedermayer2011-10-141-0/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-131-2/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (31 commits) tiffenc: initialize forgotten avctx. avplay: free the active audio packet at exit. avplay: free rdft data used for spectrogram analysis. log.h: make AVClass a named struct fix ac3 encoder documentation vc1: more prettyprinting cosmetics vc1: prettyprint some tables vc1: K&R formatting cosmetics AVOptions: bump minor and add APIchanges entry. cmdutils/avtools: simplify show_help() by using av_opt_child_class_next() AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* Remove all uses of deprecated AVOptions API. AVOptions: add av_opt_next, deprecate av_next_option. AVOptions: add functions for evaluating option strings. AVOptions: split get_number(). AVOptions: add av_opt_get*, deprecate av_get*. AVOptions: add av_opt_set*(). AVOptions: add new API for enumerating children. rv34: move inverse transform functions to DSP context flvenc: Write the right metadata entry count ... Conflicts: avconv.c cmdutils.c doc/APIchanges ffplay.c ffprobe.c libavcodec/ac3dec.c libavcodec/h264.c libavcodec/libvpxenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options.c libavdevice/libdc1394.c libavdevice/v4l2.c libavfilter/vf_drawtext.c libavformat/flvdec.c libavformat/mpegtsenc.c libavformat/options.c libavutil/avutil.h libavutil/opt.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cmdutils/avtools: simplify show_help() by using av_opt_child_class_next()Anton Khirnov2011-10-121-0/+10
| |
| * AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_*Anton Khirnov2011-10-121-1/+1
| |
| * Remove all uses of deprecated AVOptions API.Anton Khirnov2011-10-121-1/+1
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-101-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: mpeg4dec: use unsigned type for startcode in ff_mpeg4_decode_picture_header mpeg124: use sign_extend() function ac3dec: use get_sbits() instead of manually sign-extending 4xm: fix signed overflow wmavoice: fix a signed overflow mpegvideo_enc: fix a signed overflow crc: fix signed overflow fate: run avconv with -nostats flag avtools: add -v as alias for -loglevel avconv: always print stats with AV_LOG_INFO doc/avconv: add forgotten output/per-stream info to -filter avconv: add -stats option to enable/disable printing encoding progress avconv: in output_packet() don't set decoded_data_size for video. avconv: remove pointless always true condition avconv: factorize common code in transcode_init() zmbv: remove memcpy() of decoded frame mpeg12enc: use sign_extend() function h264pred: use unsigned types for pixel values, fix signed overflows h264: fix signed overflows in x*0x01010101 expressions h264pred: remove unused variables Conflicts: avconv.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avtools: add -v as alias for -loglevelMans Rullgard2011-10-091-0/+2
| | | | | | | | | | | | This saves a bit of typing. Signed-off-by: Mans Rullgard <mans@mansr.com>
* | Show configuration and library version with AV_LOG_INFO.Carl Eugen Hoyos2011-09-291-3/+3
| | | | | | | | | | | | | | This partly reverts 1c5e9551bca12e040270e0cd3d71440f83e9f8ae, a change of behaviour that was not discussed. The reason for the revert is that FFmpeg cares about bugreports.
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-281-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: avconv: use different variables for decoded and filtered frame. avconv: add support for copying attachments. matroskaenc: write attachments. matroskadec: export mimetype of attachments as metadata. avconv: factorize common code from new_*_stream() doc/avconv: expand documentation for some options. doc/avconv: document -timelimit. Conflicts: avconv.c cmdutils.c tests/codec-regression.sh Merged-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status