Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 28, 2012
  1. cmdutils: add -layouts option.

    Nicolas George authored
    Extract of the output:
    
    | Individual channels:
    | NAME        DESCRIPTION
    | FL          front left
    | FR          front right
    | <snip>
    | SDR         surround direct right
    |
    | Standard channel layouts:
    | NAME        DECOMPOSITION
    | mono        FC
    | stereo      FL+FR
    | <snip>
    | octagonal   FL+FR+FC+BL+BR+BC+SL+SR
    | downmix     DL+DR
Commits on Aug 20, 2012
  1. @michaelni

    Merge commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174'

    michaelni authored
    * commit 'f8b1e665539010d3ca148f09cb1203c20c1ca174':
      avconv: print info/capabilities options in a separate help group.
      avtools: add -h demuxer/muxer
      cmdutils: extend -h to allow printing codec details.
    
    Conflicts:
    	cmdutils.h
    	ffmpeg_filter.c
    	ffmpeg_opt.c
    	ffplay.c
    	ffserver.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @michaelni

    Merge commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf'

    michaelni authored
    * commit 'd3810c47fe8c9509c28c65c0244e743c1d353daf':
      avconv: get rid of ugly casts in the options table.
      avconv: try to match codecs by codec descriptor name as a last resort.
      avtools: fix show_foo() signatures.
    
    Conflicts:
    	cmdutils.c
    	cmdutils.h
    	cmdutils_common_opts.h
    	ffmpeg_opt.c
    	ffplay.c
    	ffprobe.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Aug 19, 2012
  1. @elenril
  2. @elenril

    avtools: fix show_foo() signatures.

    elenril authored
    show_foo() functions are declared as void show_foo(void), but called as
    int show_foo(const char*, const char*).
Commits on Aug 18, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      mpegvideo_enc: don't use deprecated avcodec_encode_video().
      cmdutils: refactor -codecs option.
      avconv: make -shortest a per-output file option.
      lavc: add avcodec_descriptor_get_by_name().
      lavc: add const to AVCodec* function parameters.
      swf(dec): replace CODEC_ID with AV_CODEC_ID
      dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
      rtmpdh: Do not generate the same private key every time when using libnettle
      rtp: remove ff_rtp_get_rtcp_file_handle().
      rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
      avio: add (ff)url_get_multi_file_handle() for getting more than one fd
      h264: vdpau: fix crash with unsupported colorspace
      amrwbdec: Decode the fr_quality bit properly
    
    Conflicts:
    	Changelog
    	cmdutils.c
    	cmdutils_common_opts.h
    	doc/ffmpeg.texi
    	ffmpeg.c
    	ffmpeg.h
    	ffmpeg_opt.c
    	libavcodec/h264.c
    	libavcodec/options.c
    	libavcodec/utils.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @elenril

    cmdutils: refactor -codecs option.

    elenril authored
    Make it print a list of AVCodecDescriptors.
    
    Add new -decoders and -encoders options that print lists of decoders and
    encoders respectively.
Commits on Apr 5, 2012
  1. @michaelni

    cmdutils: fix -fdebug without -v xy

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Mar 7, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * 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>
Commits on Feb 19, 2012
  1. @michaelni

    cmdutils: add -cpuflags.

    michaelni authored
    This allows globally forcing specific cpuflags (or lack thereof)
    Useful for debugging and benchmarking
    
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 25, 2011
  1. @michaelni

    ff*: add -max_alloc command line option

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Dec 10, 2011
  1. fftools: add -report option.

    Nicolas George authored
Commits on Oct 14, 2011
  1. @michaelni

    cmdutils: Fix loglevel for -debug

    michaelni authored
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 10, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * 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>
Commits on Oct 9, 2011
  1. @mansr

    avtools: add -v as alias for -loglevel

    mansr authored
    This saves a bit of typing.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Sep 11, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (31 commits)
      audioconvert: add explanatory comments to channel_names array
      audioconvert: K&R whitespace cosmetics
      avconv: use correct index when selecting metadata to write to.
      avconv: fix inverted variable
      doc/avconv: document option types (input/output/per-stream/...)
      doc/avtools-common-opts: write a section about stream specifiers.
      doc/avconv: remove two pointless paragraphs.
      doc/avconv: document that global options should be specified first.
      doc/avconv: remove entries for nonexistent options
      doc/avconv: remove documentation for removed 'timestamp' option
      doc: cosmetics, rename fftools-common-opts to avtools-....
      avconv: move streamid_map to options context.
      avconv: extend -vf syntax
      avconv: move top_field_first to options context.
      avconv: move inter/intra matrix to options context.
      avconv: remove -psnr option.
      avconv: remove me_threshold option.
      avconv: move video_rc_override_string to options context.
      avconv: move frame pixel format to the options context.
      avconv: move frame aspect ratio to the options context.
      ...
    
    Conflicts:
    	avconv.c
    	cmdutils_common_opts.h
    	doc/avconv.texi
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @elenril

    avconv: move audio_sample_fmt to options context.

    elenril authored
    Also document it and replace undocumented and inconsistent
    '-sample_fmt list' syntax with -sample_fmts.
Commits on Jun 30, 2011
  1. Make all option parsing functions match the function pointer type thr…

    Jeff Downs authored
    …ough which they are called.
    
    All option parsing functions now match the function pointer signature through
    which they are called (int f(const char *, const char *), thereby working
    reliably on all platforms.
    Prefix all option processing functions with opt_
Commits on May 28, 2011
  1. cmdutils: remove OPT_FUNC2

    Stefano Sabatini authored
    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.
  2. @rbultje

    cmdutils: remove OPT_FUNC2

    Stefano Sabatini authored rbultje committed
    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>
Commits on Dec 21, 2009
  1. Implement a -pix_fmts option for listing all the supported pixel

    Stefano Sabatini authored
    formats.
    
    Originally committed as revision 20909 to svn://svn.ffmpeg.org/ffmpeg/trunk
  2. @ramiropolla

    Add -?, -help, and --help as alternative options to get help.

    ramiropolla authored
    Originally committed as revision 20906 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Dec 12, 2009
  1. Implement a -filters option, listing all the available libavfilter

    Stefano Sabatini authored
    filters.
    Currently filters are not registered, so the option will show none.
    
    Originally committed as revision 20807 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Nov 29, 2009
  1. Factorize common commandline options definition.

    Stefano Sabatini authored
    Originally committed as revision 20664 to svn://svn.ffmpeg.org/ffmpeg/trunk
Something went wrong with that request. Please try again.