Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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 Mar 4, 2012
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

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

    lavc: deprecate AVCodecContext.sub_id.

    elenril authored
    In most places where it's used, it's as a pointless write-only field.
    
    Only rv10 decoder actually reads from it, but it stores some internal
    version info in it. There is no reason for it to be in a public field.
Commits on Oct 21, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master: (47 commits)
      lavc: hide private symbols.
      lavc: deprecate img_get_alpha_info().
      lavc: use avpriv_ prefix for ff_toupper4.
      lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
      lavc: use avpriv_ prefix for ff_ac3_parse_header.
      lavc: use avpriv_ prefix for ff_frame_rate_tab.
      lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
      lavc: use avpriv_ prefix for ff_split_xiph_headers.
      lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
      lavc: use avpriv_ prefix for some dv symbols used in lavf.
      lavc: use avpriv_ prefix for some flac symbols used in lavf.
      lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
      lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
      lavc: use avpriv_ prefix for ff_aac_parse_header().
      lavf: hide private symbols.
      lavf: use avpriv_ prefix for some dv functions.
      lavf: use avpriv_ prefix for ff_new_chapter().
      avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
      avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
      avcodec: clarify documentation of CODEC_CAP_DELAY
      ...
    
    Conflicts:
    	configure
    	doc/general.texi
    	libavcodec/Makefile
    	libavcodec/aacdec.c
    	libavcodec/allcodecs.c
    	libavcodec/avcodec.h
    	libavcodec/dv.c
    	libavcodec/dvdata.c
    	libavcodec/dvdata.h
    	libavcodec/libspeexenc.c
    	libavcodec/mpegvideo.c
    	libavcodec/version.h
    	libavformat/avidec.c
    	libavformat/dv.c
    	libavformat/dv.h
    	libavformat/flvenc.c
    	libavformat/mov.c
    	libavformat/mp3enc.c
    	libavformat/oggparsespeex.c
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on Oct 20, 2011
  1. @elenril

    lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.

    elenril authored
    Specifically, ff_mpa_freq_tab, ff_mpa_bitrate_tab, ff_mpa_decode_header,
    ff_mpegaudio_decode_header.
Commits on May 21, 2011
  1. @michaelni

    Merge remote-tracking branch 'qatar/master'

    michaelni authored
    * qatar/master:
      configure: make executable again
      LATM/AAC: Free previously initialized context on reinit.
      configure: Do not unconditionally add -Wall to host CFLAGS.
      configure: Set OS/2 objformat to a.out.
      Add support for a.out object format to assembler macros.
      fate: disable threading for encoding
      fate: add comment field
      fate: allow overriding default build and install dirs
      mpegtsenc: Add an AVClass pointer to the private data
      mpegaudio: clean up #includes
      mpegaudio: move all header parsing to mpegaudiodecheader.[ch]
    
    Merged-by: Michael Niedermayer <michaelni@gmx.at>
Commits on May 20, 2011
  1. @mansr

    mpegaudio: move all header parsing to mpegaudiodecheader.[ch]

    mansr authored
    Signed-off-by: Mans Rullgard <mans@mansr.com>
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 30, 2011
  1. @lu-zero @michaelni

    Replace dprintf with av_dlog

    lu-zero authored michaelni committed
    dprintf clashes with POSIX.1-2008
    (cherry picked from commit dfd2a00)
Commits on Jan 29, 2011
  1. @lu-zero

    Replace dprintf with av_dlog

    lu-zero authored
    dprintf clashes with POSIX.1-2008
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 Feb 28, 2010
  1. Include mpegaudiodecheader.h: It contains the prototype for

    Carl Eugen Hoyos authored
    ff_mpegaudio_decode_header().
    
    Originally committed as revision 22103 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on May 31, 2009
  1. @bcoudurier

    fix compilation with DEBUG defined

    bcoudurier authored
    Originally committed as revision 19015 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Feb 1, 2009
  1. @DonDiego

    Use full internal pathname in doxygen @file directives.

    DonDiego authored
    Otherwise doxygen complains about ambiguous filenames when files exist
    under the same name in different subdirectories.
    
    Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Jan 23, 2009
  1. @andoma

    Avoid allocating MPADecodeContext on stack.

    andoma authored
    Instead move relevant fields into MPADecodeHeader and use it
    where appropriate.
    
    Originally committed as revision 16728 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on Jan 19, 2009
  1. @DonDiego

    cosmetics: Remove pointless period after copyright statement non-sent…

    DonDiego authored
    …ences.
    
    Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
Commits on May 20, 2007
  1. @aurelj

    add a ff_ prefix to some mpegaudio funcs

    aurelj authored
    Originally committed as revision 9081 to svn://svn.ffmpeg.org/ffmpeg/trunk
  2. @aurelj

    loosen dependencies over mpegaudiodec

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