Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Aug 07, 2012

  1. Michael Niedermayer

    Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

    * 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>
    michaelni authored
  2. elenril

    Replace all CODEC_ID_* with AV_CODEC_ID_*

    elenril authored

Apr 07, 2012

  1. Michael Niedermayer

    Merge remote-tracking branch 'qatar/master'

    * 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>
    michaelni authored

Apr 06, 2012

  1. Martin Storsjö

    cosmetics: Align codec declarations

    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>
    mstorsjo authored

Mar 23, 2012

  1. Paul B Mahol

    cosmetics: remove superfluous curly brackets

    Signed-off-by: Paul B Mahol <onemda@gmail.com>
    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    richardpl authored michaelni committed

Mar 22, 2012

  1. Michael Niedermayer

    pcxenc: switch to ff_alloc_packet2().

    Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
    michaelni authored

Feb 21, 2012

  1. Michael Niedermayer

    Merge remote-tracking branch 'qatar/master'

    * 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>
    michaelni authored

Feb 20, 2012

  1. elenril

    pcxenc: switch to encode2().

    elenril authored

Dec 27, 2011

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

    …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>
    Frank Vernaillen authored michaelni committed

Jul 30, 2011

  1. Michael Niedermayer

    Merge remote-tracking branch 'qatar/master'

    * 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>
    michaelni authored

Jul 29, 2011

  1. elenril

    lavc: use designated initialisers for all codecs.

    It's more readable and less prone to breakage.
    elenril authored

Jul 15, 2011

  1. Michael Niedermayer

    Merge remote-tracking branch 'qatar/master'

    * 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>
    michaelni authored
  2. Diego Biurrun

    doxygen: replace @sa tag by the more readable but equivalent @see

    DonDiego authored

Jul 14, 2011

  1. Diego Biurrun

    doxygen: consistently place brief description

    DonDiego authored

May 02, 2011

  1. replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*

    Stefano Sabatini authored
  2. Replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_*.

    Signed-off-by: Diego Biurrun <diego@biurrun.de>
    Stefano Sabatini authored DonDiego committed

Mar 19, 2011

  1. Mans Rullgard

    Replace FFmpeg with Libav in licence headers

    Signed-off-by: Mans Rullgard <mans@mansr.com>
    mansr authored

Jan 28, 2011

  1. Diego Elio Pettenò

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

    …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)
    Flameeyes authored michaelni committed

Jan 26, 2011

  1. Diego Elio Pettenò

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

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

Dec 25, 2010

  1. Daniel Verkamp

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

    Patch by Daniel Verkamp [daniel drv nu].
    
    Originally committed as revision 26088 to svn://svn.ffmpeg.org/ffmpeg/trunk
    danielverkamp authored Reimar Döffinger committed

Apr 20, 2010

  1. Diego Biurrun

    Remove explicit filename from Doxygen @file commands.

    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
    DonDiego authored

Mar 30, 2010

  1. Define AVMediaType enum, and use it instead of enum CodecType, which

    is deprecated and will be dropped at the next major bump.
    
    Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
    Stefano Sabatini authored

Sep 06, 2009

  1. Mark all pix_fmts and supported_framerates compound literals as const.

    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
    Reimar Döffinger authored

Mar 20, 2009

  1. Daniel Verkamp

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

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