Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Aug 7, 2012
  1. @michaelni

    Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

    michaelni authored
    * commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
      Replace all CODEC_ID_* with AV_CODEC_ID_*
      lavc: add AV prefix to codec ids.
    
    Conflicts:
    	doc/APIchanges
    	doc/examples/decoding_encoding.c
    	doc/examples/muxing.c
    	ffmpeg.c
    	ffprobe.c
    	ffserver.c
    	libavcodec/8svx.c
    	libavcodec/avcodec.h
    	libavcodec/dnxhd_parser.c
    	libavcodec/dvdsubdec.c
    	libavcodec/error_resilience.c
    	libavcodec/h263dec.c
    	libavcodec/libvorbisenc.c
    	libavcodec/mjpeg_parser.c
    	libavcodec/mjpegenc.c
    	libavcodec/mpeg12.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/mpegvideo.c
    	libavcodec/mpegvideo_enc.c
    	libavcodec/pcm.c
    	libavcodec/r210dec.c
    	libavcodec/utils.c
    	libavcodec/v210dec.c
    	libavcodec/version.h
    	libavdevice/alsa-audio-dec.c
    	libavdevice/bktr.c
    	libavdevice/v4l2.c
    	libavformat/asfdec.c
    	libavformat/asfenc.c
    	libavformat/avformat.h
    	libavformat/avidec.c
    	libavformat/caf.c
    	libavformat/electronicarts.c
    	libavformat/flacdec.c
    	libavformat/flvdec.c
    	libavformat/flvenc.c
    	libavformat/framecrcenc.c
    	libavformat/img2.c
    	libavformat/img2dec.c
    	libavformat/img2enc.c
    	libavformat/ipmovie.c
    	libavformat/isom.c
    	libavformat/matroska.c
    	libavformat/matroskadec.c
    	libavformat/matroskaenc.c
    	libavformat/mov.c
    	libavformat/movenc.c
    	libavformat/mp3dec.c
    	libavformat/mpeg.c
    	libavformat/mpegts.c
    	libavformat/mxf.c
    	libavformat/mxfdec.c
    	libavformat/mxfenc.c
    	libavformat/nsvdec.c
    	libavformat/nut.c
    	libavformat/oggenc.c
    	libavformat/pmpdec.c
    	libavformat/rawdec.c
    	libavformat/rawenc.c
    	libavformat/riff.c
    	libavformat/sdp.c
    	libavformat/utils.c
    	libavformat/vocenc.c
    	libavformat/wtv.c
    	libavformat/xmv.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @elenril
Commits on Apr 7, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      rtpdec_asf: Set the no_resync_search option for the chained asf demuxer
      asfdec: Add an option for not searching for the packet markers
      cosmetics: Clean up the tiffenc pix_fmts declaration to match the style of others
      cosmetics: Align codec declarations
      cosmetics: Convert mimic.c to utf-8
      avconv: remove an unused function parameter.
      avconv: remove now pointless variables.
      avconv: drop support for building without libavfilter.
      nellymoserenc: fix crash due to memsetting the wrong area.
      libavformat: Only require first packet to be known for audio/video streams
      avplay: Don't try to scale timestamps if the tb isn't set
    
    Conflicts:
    	Changelog
    	configure
    	ffmpeg.c
    	libavcodec/aacenc.c
    	libavcodec/bmpenc.c
    	libavcodec/dnxhddec.c
    	libavcodec/dnxhdenc.c
    	libavcodec/ffv1.c
    	libavcodec/flacenc.c
    	libavcodec/fraps.c
    	libavcodec/huffyuv.c
    	libavcodec/libopenjpegdec.c
    	libavcodec/mpeg12enc.c
    	libavcodec/mpeg4videodec.c
    	libavcodec/pamenc.c
    	libavcodec/pgssubdec.c
    	libavcodec/pngenc.c
    	libavcodec/qtrleenc.c
    	libavcodec/rawdec.c
    	libavcodec/sgienc.c
    	libavcodec/tiffenc.c
    	libavcodec/v210dec.c
    	libavcodec/wmv2dec.c
    	libavformat/utils.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Apr 6, 2012
  1. @mstorsjo

    cosmetics: Align codec declarations

    mstorsjo authored
    Also break some long lines, remove codec function placeholder comments
    and add spaces in sample/pixel format lists.
    
    Signed-off-by: Martin Storsjö <martin@martin.st>
Commits on Mar 23, 2012
  1. @richardpl @michaelni

    cosmetics: remove superfluous curly brackets

    richardpl authored michaelni committed
    Signed-off-by: Paul B Mahol <onemda@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Mar 22, 2012
  1. @michaelni

    pcxenc: switch to ff_alloc_packet2().

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

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (36 commits)
      adpcmenc: Use correct frame_size for Yamaha ADPCM.
      avcodec: add ff_samples_to_time_base() convenience function to internal.h
      adx parser: set duration
      mlp parser: set duration instead of frame_size
      gsm parser: set duration
      mpegaudio parser: set duration instead of frame_size
      (e)ac3 parser: set duration instead of frame_size
      flac parser: set duration instead of frame_size
      avcodec: add duration field to AVCodecParserContext
      avutil: add av_rescale_q_rnd() to allow different rounding
      pnmdec: remove useless .pix_fmts
      libmp3lame: support float and s32 sample formats
      libmp3lame: renaming, rearrangement, alignment, and comments
      libmp3lame: use the LAME default bit rate
      libmp3lame: use avpriv_mpegaudio_decode_header() for output frame parsing
      libmp3lame: cosmetics: remove some pointless comments
      libmp3lame: convert some debugging code to av_dlog()
      libmp3lame: remove outdated comment.
      libmp3lame: do not set coded_frame->key_frame.
      libmp3lame: improve error handling in MP3lame_encode_init()
      ...
    
    Conflicts:
    	doc/APIchanges
    	libavcodec/libmp3lame.c
    	libavcodec/pcxenc.c
    	libavcodec/pnmdec.c
    	libavcodec/pnmenc.c
    	libavcodec/sgienc.c
    	libavcodec/utils.c
    	libavformat/hls.c
    	libavutil/avutil.h
    	libswscale/x86/swscale_mmx.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Feb 20, 2012
  1. @elenril

    pcxenc: switch to encode2().

    elenril authored
Commits on Dec 27, 2011
  1. @michaelni

    Fixed crash in palette handling when converting certain .png images t…

    Frank Vernaillen authored michaelni committed
    …o .pcx or .bmp.
    
    The existing code expected a palette buffer holding 256 uint32_t's allocated in the data[1] field of the AVFrame structure, but data[1] was NULL. The bug is fixed by using a fixed local array (palette256) to hold the palette instead.
    
    This solves http://ffmpeg.org/trac/ffmpeg/ticket/833
    
    Signed-off-by: Frank Vernaillen <fr_ve@hotmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 30, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      mxfdec: Include FF_INPUT_BUFFER_PADDING_SIZE when allocating extradata.
      H.264: tweak some other x86 asm for Atom
      probe: Fix insane flow control.
      mpegts: remove invalid error check
      s302m: use nondeprecated audio sample format API
      lavc: use designated initialisers for all codecs.
      x86: cabac: add operand size suffixes missing from 6c32576
    
    Conflicts:
    	libavcodec/ac3enc_float.c
    	libavcodec/flacenc.c
    	libavcodec/frwu.c
    	libavcodec/pictordec.c
    	libavcodec/qtrleenc.c
    	libavcodec/v210enc.c
    	libavcodec/wmv2dec.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Jul 29, 2011
  1. @elenril

    lavc: use designated initialisers for all codecs.

    elenril authored
    It's more readable and less prone to breakage.
Commits on Jul 15, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      configure: Automatically add more flags required on symbian
      mem.h: switch doxygen parameter order to match function prototype
      doxygen: replace @sa tag by the more readable but equivalent @see
      doxygen: use Doxygen markup for authors and web links where appropriate
      doxygen: do not include license boilerplate in Doxygen documentation
      ac3enc: Mark AVClasses const
      ffserver: Replace two loops with one loop.
      ffmpeg: Fix the check for experimental codecs
      swscale: extend mmx padding.
      swscale: clip unscaled colorspace conversion path.
      doxygen: misc consistency cosmetics
      doc: remove file name from @file directive in Doxygen usage example
      doxygen: consistently place brief description
      doxygen: place empty line between brief description and detailed description
      avformat_open_input(): Add braces to shut up gcc warning.
    
    Conflicts:
    	libavcodec/8svx.c
    	libavcodec/tiff.c
    	libavcodec/tiff.h
    	libavcodec/vaapi_h264.c
    	libavcodec/vorbis.c
    	libavcodec/vorbisdec.c
    	libavcodec/vp6.c
    	libswscale/swscale_unscaled.c
    	libswscale/utils.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
  2. @DonDiego
Commits on Jul 14, 2011
  1. @DonDiego
Commits on May 2, 2011
  1. replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*

    Stefano Sabatini authored
  2. @DonDiego

    Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.

    Stefano Sabatini authored DonDiego committed
    Signed-off-by: Diego Biurrun <diego@biurrun.de>
Commits on Mar 19, 2011
  1. @mansr

    Replace FFmpeg with Libav in licence headers

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Jan 28, 2011
  1. @Flameeyes @michaelni

    Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parser…

    Flameeyes authored michaelni committed
    …s, bsf.
    
    None of these symbols should be accessed directly, so declare them as
    hidden.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    (cherry picked from commit d36beb3)
Commits on Jan 26, 2011
  1. @Flameeyes @mansr

    Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parser…

    Flameeyes authored mansr committed
    …s, bsf.
    
    None of these symbols should be accessed directly, so declare them as
    hidden.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
Commits on Dec 25, 2010
  1. @danielverkamp

    Fix size of monoblack_pal array, code uses 16 values unconditionally.

    danielverkamp authored Reimar Döffinger committed
    Patch by Daniel Verkamp [daniel drv nu].
    
    Originally committed as revision 26088 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Apr 20, 2010
  1. @DonDiego

    Remove explicit filename from Doxygen @file commands.

    DonDiego authored
    Passing an explicit filename to this command is only necessary if the
    documentation in the @file block refers to a file different from the
    one the block resides in.
    
    Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Mar 30, 2010
  1. Define AVMediaType enum, and use it instead of enum CodecType, which

    Stefano Sabatini authored
    is deprecated and will be dropped at the next major bump.
    
    Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Sep 6, 2009
  1. Mark all pix_fmts and supported_framerates compound literals as const.

    Reimar Döffinger authored
    Makes no difference for gcc but at least icc can put them in .rodata then.
    
    Originally committed as revision 19789 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Mar 20, 2009
  1. @danielverkamp

    PCX encoder that handles 1-, 8-, and 24-bpp pixfmts.

    danielverkamp authored Carl Eugen Hoyos committed
    Patch by Daniel Verkamp, daniel drv nu
    
    Originally committed as revision 18077 to svn://svn.ffmpeg.org/ffmpeg/trunk
Something went wrong with that request. Please try again.