generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
80e4fe4063
ffmpeg/tests/ref/seek
History
Michael Niedermayer 58257ea29e Merge remote-tracking branch 'qatar/master' 
* qatar/master: (28 commits)
  mp3enc: write a xing frame containing number of frames in the file
  lavf: update AVStream.nb_frames when muxing.
  ffmpeg: remove unused variables from InputStream.
  doc: update ffmpeg -ar and -ac documentation to reflect reality.
  ffmpeg: remove pointless if (nb_input_files)
  ffmpeg: merge input_files_ts_offset into input_files.
  ffmpeg: merge input_codecs into input_streams.
  ffmpeg: drop AV prefixes from struct names.
  ffmpeg: deprecate loop_input and loop_output options
  gif: add loop private option.
  img2: add loop private option.
  AVOptions: in av_opt_find() don't return named constants unless unit is specified.
  x11grab: replace undocumented nomouse hackery with a private option.
  dict: extend documentation.
  lls: whitespace cosmetics
  docs: Use proper markup for a literal command line option
  docs: Remove a remark that isn't relevant any longer
  docs: Explain how to regenerate import libraries with MSVC tools
  docs: Mention that libraries for MSVC can be built with a cross compiler
  docs: Remove old docs that mention setting up a build environment with lib.exe
  ...

Conflicts:
	doc/ffmpeg.texi
	doc/general.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/dnxhddata.c
	libavformat/mp3enc.c
	libavformat/utils.c
	libavutil/Makefile
	tests/copycooker.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-07-09 02:06:40 +02:00
..
ac3_rm ac3enc: correct the flipped sign in the ac3_fixed encoder 2011-04-26 17:19:37 -04: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 Add a FLAC parser. 2010-12-07 14:50:50 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 asf: update seek test reference 2011-03-17 19:51:28 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_rm regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_swf regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
lavf_ts regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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_mpg regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s8_mov regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s16be_mkv 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_mkv regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_s16le_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00:00
pcm_zork_wav regtest: rename seektest ref files using alphanumeric chars only 2010-07-20 10:09:54 +00: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 asf: update seek test reference 2011-03-17 19:51:28 +00:00
wmav2_asf asf: update seek test reference 2011-03-17 19:51:28 +00: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