Michael Niedermayer 7b0b10ce41 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>		2011-12-02 00:51:11 +01:00
..
fate	fate: enable new sbr tests after our rsync server has them now.	2011-11-26 23:13:50 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2011-12-02 00:51:11 +01:00
audiogen.c
base64.c
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-12-02 00:51:11 +01:00
copycooker.sh
fate2.mak	fate: fix mapchan	2011-11-06 03:01:01 +01:00
fate_config.sh.template	tests: add a FATE configuration template	2011-11-24 00:33:20 +01:00
fate-run.sh
fate-update.sh
fate.mak	Merge remote-tracking branch 'qatar/master'	2011-11-24 03:32:24 +01:00
fate.sh
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-11-19 02:00:06 +01:00
lavfi-regression.sh
lena.pnm
Makefile	fate: add --timeout=60 --contimeout=60 to fate-rsync	2011-11-07 15:13:16 +01:00
md5.sh
regression-funcs.sh
rotozoom.c
tiny_psnr.c
videogen.c