virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity
c66bd78e3d
FFmpeg/tests/ref/seek
History
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 seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 2011-10-21 20:45:00 +02:00
adpcm_ima_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
adpcm_ms_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
adpcm_qt_aiff regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
adpcm_swf_flv regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
adpcm_yam_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
alac_m4a regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
asv1_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
asv2_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
dnxhd_720p_dnxhd regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
dnxhd_720p_rd_dnxhd regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
dnxhd_1080i_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
dv50_dv Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dv411_dv Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dv_dv Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
error_mpeg4_adv_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
ffv1_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
flac_flac Replace vendor string in Ogg and FLAC muxers. 2011-11-02 10:43:39 +01:00
flashsv_flv regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
flv_flv regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
g726_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
h261_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
h263_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
h263p_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
huffyuv_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_bmp regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_jpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_pcx regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_pgm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_ppm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_sgi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_tga regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
image_tiff regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
jpegls_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_aif regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_al regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_asf utils: flush on successfull av_seek_frame_binary() 2011-10-21 22:26:13 +02:00
lavf_au regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_avi lavf/utils: fix ff_interleave_compare_dts corner case. 2011-05-10 07:53:19 -04:00
lavf_dv Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
lavf_ffm ffmdec: fix seeking for non indexed files 2011-09-08 20:53:37 +02:00
lavf_flv regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_gif ffmpeg: deprecate loop_input and loop_output options 2011-07-08 19:58:19 +02:00
lavf_gxf regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_mkv regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_mmf regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_mpg Avoid negative SCR in mpeg ps muxer. 2010-10-16 21:31:31 +00:00
lavf_mxf regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_mxf_d10 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_nut lavf/utils: fix ff_interleave_compare_dts corner case. 2011-05-10 07:53:19 -04:00
lavf_ogg Replace vendor string in Ogg and FLAC muxers. 2011-11-02 10:43:39 +01:00
lavf_rm seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 2011-10-21 20:45:00 +02:00
lavf_swf regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_ts seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 2011-10-21 20:45:00 +02:00
lavf_ul regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_voc regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
lavf_y4m regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
ljpeg_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mjpeg_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mp2_mp2 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg1_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg1b_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg2_422_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg2_idct_int_mpg regtest: split video encode/decode tests into individual targets 2011-11-22 12:13:04 +00:00
mpeg2i_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg2ivlc_qprd_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg2reuse_mpg fate: remove seek-mpeg2reuse test 2011-09-28 02:30:30 +01:00
mpeg2thread_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg2threadivlc_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_adap_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_adv_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_nr_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_Q_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_qprd_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_rc_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
mpeg4_thread_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
msmpeg4_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
msmpeg4v2_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
odivx_mp4 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pbmpipe_pbm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_alaw_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
pcm_f32be_au regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_f32le_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_f64be_au regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_f64le_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_mulaw_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
pcm_s8_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s16be_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s16le_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
pcm_s24be_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s24daud_302 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s24le_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s32be_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s32le_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_u8_wav riff: always generate a proper WAVEFORMATEX structure in ff_put_wav_header 2011-10-14 13:28:58 +02:00
pgmpipe_pgm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
ppmpipe_ppm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
rgb_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
roqav_roq regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
rv10_rm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
rv20_rm Update rv20 seek test reference 2010-09-26 09:02:51 +00:00
snow53_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
snow_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
svq1_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
wmav1_asf seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 2011-10-21 20:45:00 +02:00
wmav2_asf seek: Fix av_gen_search() so that seeks outside max/min do not successfully seek to random 2011-10-21 20:45:00 +02:00
wmv1_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
wmv2_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
yuv_avi regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00