Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Jul 9, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      mss3: use standard zigzag table
      mss3: split DSP functions that are used in MTS2(MSS4) into separate file
      motion-test: do not use getopt()
      tcp: add initial timeout limit for incoming connections
      configure: Change the rdtsc check to a linker check
      avconv: propagate fatal errors from lavfi.
      lavfi: add error handling to filter_samples().
      fate-run: make avconv() properly deal with multiple inputs.
      asplit: don't leak the input buffer.
      af_resample: fix request_frame() behavior.
      af_asyncts: fix request_frame() behavior.
      libx264: support aspect ratio switching
      matroskadec: honor error_recognition when encountering unknown elements.
      lavr: resampling: add support for s32p, fltp, and dblp internal sample formats
      lavr: resampling: add filter type and Kaiser window beta to AVOptions
      lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format
      lavr: mix: validate internal sample format in ff_audio_mix_init()
    
    Conflicts:
    	ffmpeg.c
    	ffplay.c
    	libavcodec/libx264.c
    	libavfilter/audio.c
    	libavfilter/split.c
    	libavformat/tcp.c
    	tests/fate-run.sh
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jun 26, 2012
  1. @michaelni

    Merge commit 'a5e8c41c28f907d98d2a739db08f7aef4cbfcf3a'

    michaelni authored
    * 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 <michaelni@gmx.at>
Commits on May 16, 2012
  1. @saste

    lavfi: drop planar/packed negotiation support

    saste authored
    The planar/packed switch and the packing_formats list is no longer
    required, since the planar/packed information is now stored in the sample
    format enum.
    
    This is technically a major API break, possibly it should be not too
    painful as we marked the audio filtering API as unstable.
Commits on May 12, 2012
  1. @ubitux

    lavfi: remove audio.h include from avfilter.h.

    ubitux authored
    avfilter.h is a public header and the unexported audio.h header contains
    only internal prototypes.
Commits on May 10, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (25 commits)
      rv40dsp x86: MMX/MMX2/3DNow/SSE2/SSSE3 implementations of MC
      ape: Use unsigned integer maths
      arm: dsputil: fix overreads in put/avg_pixels functions
      h264: K&R formatting cosmetics for header files (part II/II)
      h264: K&R formatting cosmetics for header files (part I/II)
      rtmp: Implement check bandwidth notification.
      rtmp: Support 'rtmp_swfurl', an option which specifies the URL of the SWF player.
      rtmp: Support 'rtmp_flashver', an option which overrides the version of the Flash plugin.
      rtmp: Support 'rtmp_tcurl', an option which overrides the URL of the target stream.
      cmdutils: Add fallback case to switch in check_stream_specifier().
      sctp: be consistent with socket option level
      configure: Add _XOPEN_SOURCE=600 to Solaris preprocessor flags.
      vcr1enc: drop pointless empty encode_init() wrapper function
      vcr1: drop pointless write-only AVCodecContext member from VCR1Context
      vcr1: group encoder code together to save #ifdefs
      vcr1: cosmetics: K&R prettyprinting, typos, parentheses, dead code, comments
      mov: make one comment slightly more specific
      lavr: replace the SSE version of ff_conv_fltp_to_flt_6ch() with SSE4 and AVX
      lavfi: move audio-related functions to a separate file.
      lavfi: remove some audio-related function from public API.
      ...
    
    Conflicts:
    	cmdutils.c
    	libavcodec/h264.h
    	libavcodec/h264_mvpred.h
    	libavcodec/vcr1.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/defaults.c
    	libavfilter/internal.h
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Feb 14, 2012
  1. @saste

    lavfi/ashowinfo: only print checksum for the existing planes

    saste authored
    Make the output a bit nicer.
  2. @saste
Commits on Nov 5, 2011
  1. Mark AVFilterPad[] compound literals as const.

    Reimar Döffinger authored
    GCC 4.6.2 at least still seems to fail to put them in .rodata though,
    see also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=37303
    
    Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Commits on Oct 27, 2011
  1. @ubitux
  2. @ubitux
Commits on Oct 15, 2011
  1. @saste
  2. @saste

    af_ashowinfo: adopt used plane size when computing the plane checksum

    saste authored
    Fix checksum computation when the used plane size is different from the
    allocated plane size, as it was wrongly assumed.
Commits on Aug 20, 2011
  1. lavfi: add ashowinfo filter

    Stefano Sabatini authored
    Useful for debugging.
Something went wrong with that request. Please try again.