1. 03 Dec, 2011 7 commits
  2. 02 Dec, 2011 29 commits
  3. 01 Dec, 2011 4 commits
    • Michael Niedermayer's avatar
      Merge remote-tracking branch 'qatar/master' · 7b0b10ce
      Michael Niedermayer authored
      * qatar/master: (25 commits)
        rtpenc: Add support for G726 audio
        rtpdec: Interpret the different G726 names as bits_per_coded_sample
        rtpenc: Change rtp_send_samples to handle sample sizes other than even bytes
        rtpenc: Cast a rescaling parameter to int64_t
        h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
        ARM: fix indentation in ff_dsputil_init_neon()
        ARM: NEON put/avg_pixels8/16 cosmetics
        ARM: add remaining NEON avg_pixels8/16 functions
        ARM: clean up NEON put/avg_pixels macros
        fate: split acodec-pcm into individual tests
        swscale: #include "libavutil/mathematics.h"
        pmpdec: don't use deprecated av_set_pts_info.
        rv34: align temporary block of "dct" coefs
        Add PlayStation Portable PMP format demuxer
        proto: Realign struct initializers
        proto: Use .priv_data_size to allocate the private context
        mmsh: Properly clean up if the second ffurl_alloc failed
        rtmp: Clean up properly if the handshake failed
        md5proto: Remove the get_file_handle function
        applehttpproto: Use the close function if the open function fails
        ...
      
      Conflicts:
      	libavcodec/vble.c
      	libavformat/mmsh.c
      	libavformat/pmpdec.c
      	libavformat/udp.c
      	tests/ref/acodec/pcm
      Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      7b0b10ce
    • Carl Eugen Hoyos's avatar
      8b08f819
    • Derek Buitenhuis's avatar
      Revert "libutvideodec: Make buf_size local" · 69035f3e
      Derek Buitenhuis authored
      This change was dependent on a different patch that
      never actually made it into FFmpeg, and it actually
      ended up breaking builds.
      
      This reverts commit 70cf7bb9.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      69035f3e
    • Adrian Drzewiecki's avatar
      Fix id3v2 extended header handling. · dd7453a2
      Adrian Drzewiecki authored
      When skipping over the extended header, take into account
      that the size field has already been read. The extended header
      also takes up space, so adjust total header length accordingly.
      Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
      dd7453a2