1. 07 Feb, 2012 3 commits
    • Stefano Sabatini's avatar
      lavc: provide aliases to the PCM A-law/mu-law codecs · d21b82fd
      Stefano Sabatini authored
      They are also known as G.711 codecs.
      d21b82fd
    • Paul B Mahol's avatar
      0b717e24
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · b479e016
      Michael Niedermayer authored
      * qatar/master:
        Revert "v210enc: use FFALIGN()"
        doxygen: Do not include license boilerplates in Doxygen comment blocks.
        avplay: reset decoder flush state when seeking
        ape: skip packets with invalid size
        ape: calculate final packet size instead of guessing
        ape: stop reading after the last frame has been read
        ape: return AVERROR_EOF instead of AVERROR(EIO) when demuxing is finished
        ape: return error if seeking to the current packet fails in ape_read_packet()
        avcodec: Clarify AVFrame member documentation.
        v210dec: check for coded_frame allocation failure
        v210enc: use stride as it is already calculated
        v210enc: use FFALIGN()
        v210enc: return proper AVERROR codes instead of -1
        v210enc: do not set coded_frame->key_frame
        v210enc: check for coded_frame allocation failure
        drawtext: add 'fix_bounds' option on coords fixing
        drawtext: fix text_{w, h} expression vars
        drawtext: add missing braces around an if() block.
      
      Conflicts:
      	libavcodec/arm/vp8.h
      	libavcodec/arm/vp8dsp_init_arm.c
      	libavcodec/v210dec.c
      	libavfilter/vf_drawtext.c
      	libavformat/ape.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      b479e016
  2. 06 Feb, 2012 32 commits
  3. 05 Feb, 2012 5 commits