Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Dec 2011 23:51:11 +0000 (00:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 1 Dec 2011 23:51:11 +0000 (00:51 +0100)
commit7b0b10ce4186eaa1cd3c0a2bfbb86307d65eecfd
treea9a937af698ca14ef06ec2c07453f474aa5ca3c7
parent8b08f81949bcfa6fec42ff3f1c9bef5be8140300
parent04403ec2e405a3cfcfbdd45f1274be30c652e462
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
29 files changed:
Changelog
libavcodec/arm/dsputil_init_neon.c
libavcodec/arm/dsputil_neon.S
libavcodec/h264.c
libavcodec/rv34.c
libavformat/applehttpproto.c
libavformat/cache.c
libavformat/concat.c
libavformat/gopher.c
libavformat/http.c
libavformat/librtmp.c
libavformat/md5proto.c
libavformat/mmsh.c
libavformat/mmst.c
libavformat/pmpdec.c
libavformat/rtmpproto.c
libavformat/rtpdec_g726.c
libavformat/rtpenc.c
libavformat/rtpproto.c
libavformat/sdp.c
libavformat/tcp.c
libavformat/udp.c
libswscale/utils.c
tests/codec-regression.sh
tests/ref/acodec/pcm_s16be
tests/ref/acodec/pcm_s24be
tests/ref/acodec/pcm_s24daud
tests/ref/acodec/pcm_s32be
tests/ref/acodec/pcm_s8