ffmpeg/tests/ref/seek
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
..
ac3_rm
adpcm_ima_wav
adpcm_ms_wav
adpcm_qt_aiff
adpcm_swf_flv
adpcm_yam_wav
alac_m4a
asv1_avi
asv2_avi
dnxhd_720p_dnxhd
dnxhd_720p_rd_dnxhd
dnxhd_1080i_mov
dv50_dv
dv411_dv
dv_dv
error_mpeg4_adv_avi
ffv1_avi
flac_flac
flashsv_flv
flv_flv
g726_wav
h261_avi
h263_avi
h263p_avi
huffyuv_avi
image_bmp
image_jpg
image_pcx
image_pgm
image_ppm
image_sgi
image_tga
image_tiff
jpegls_avi
lavf_aif
lavf_al
lavf_asf
lavf_au
lavf_avi
lavf_dv
lavf_ffm
lavf_flv
lavf_gif
lavf_gxf
lavf_mkv
lavf_mmf
lavf_mov
lavf_mpg
lavf_mxf
lavf_mxf_d10
lavf_nut
lavf_ogg
lavf_rm
lavf_swf
lavf_ts
lavf_ul
lavf_voc
lavf_wav
lavf_y4m
ljpeg_avi
mjpeg_avi
mp2_mp2
mpeg1_mpg
mpeg1b_mpg
mpeg2_422_mpg
mpeg2_idct_int_mpg
mpeg2i_mpg
mpeg2ivlc_qprd_mpg
mpeg2reuse_mpg
mpeg2thread_mpg
mpeg2threadivlc_mpg
mpeg4_Q_avi
mpeg4_adap_avi
mpeg4_adv_avi
mpeg4_nr_avi
mpeg4_qprd_avi
mpeg4_rc_avi
mpeg4_thread_avi
msmpeg4_avi
msmpeg4v2_avi
odivx_mp4
pbmpipe_pbm
pcm_alaw_wav
pcm_f32be_au
pcm_f32le_wav
pcm_f64be_au
pcm_f64le_wav
pcm_mulaw_wav
pcm_s8_mov
pcm_s16be_mov
pcm_s16le_wav
pcm_s24be_mov
pcm_s24daud_302
pcm_s24le_wav
pcm_s32be_mov
pcm_s32le_wav
pcm_u8_wav
pgmpipe_pgm
ppmpipe_ppm
rgb_avi
roqav_roq
rv10_rm
rv20_rm
snow53_avi
snow_avi
svq1_mov
wmav1_asf
wmav2_asf
wmv1_avi
wmv2_avi
yuv_avi