1. 24 Feb, 2012 3 commits
    • Michael Niedermayer's avatar
      131698af
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · e2cc39b6
      Michael Niedermayer authored
      * qatar/master: (40 commits)
        swf: check return values for av_get/new_packet().
        wavpack: Don't shift minclip/maxclip
        rtpenc: Expose the max packet size via an avoption
        rtpenc: Move max_packet_size to a context variable
        rtpenc: Add an option for not sending RTCP packets
        lavc: drop encode() support for video.
        snowenc: switch to encode2().
        snowenc: don't abuse input picture for storing information.
        a64multienc: switch to encode2().
        a64multienc: don't write into output buffer when there's no output.
        libxvid: switch to encode2().
        tiffenc: switch to encode2().
        tiffenc: properly forward error codes in encode_frame().
        lavc: drop libdirac encoder.
        gifenc: switch to encode2().
        libvpxenc: switch to encode2().
        flashsvenc: switch to encode2().
        Remove libpostproc.
        lcl: don't overwrite input memory.
        swscale: take first/lastline over/underflows into account for MMX.
        ...
      
      Conflicts:
      	.gitignore
      	Makefile
      	cmdutils.c
      	configure
      	doc/APIchanges
      	libavcodec/Makefile
      	libavcodec/allcodecs.c
      	libavcodec/libdiracenc.c
      	libavcodec/libxvidff.c
      	libavcodec/qtrleenc.c
      	libavcodec/tiffenc.c
      	libavcodec/utils.c
      	libavformat/mov.c
      	libavformat/movenc.c
      	libpostproc/Makefile
      	libpostproc/postprocess.c
      	libpostproc/postprocess.h
      	libpostproc/postprocess_altivec_template.c
      	libpostproc/postprocess_internal.h
      	libpostproc/postprocess_template.c
      	libswscale/swscale.c
      	libswscale/utils.c
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      e2cc39b6
    • Michael Niedermayer's avatar
      Revert "Improve decoding quality for lossy wavpack." · 32e74395
      Michael Niedermayer authored
      This has been implemented more correctly.
      
      This reverts commit a915618a.
      32e74395
  2. 23 Feb, 2012 37 commits