RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/tests/ref/acodec
History
Michael Niedermayer 75a37b57a5 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  APIchanges: fill in date and commit for request_sample_fmt
  Add floating-point sample format support to the ac3, eac3, dca, aac, and vorbis decoders.
  Add support for request_sample_format in ffmpeg and ffplay.
  Add APIchanges entry for request_sample_fmt.
  Add request_sample_fmt field to AVCodecContext.
  Add float_interleave() to FmtConvertContext with x86-optimized versions.
  Remove unused make variable SEEK_REFFILE
  fate: remove redundant aref and vref references
  fate: remove do_ffmpeg_nocheck function
  fate: do not collect -benchmark output
  mpegaudiodec: remove decode_end() function
  fate: run aref and vref as regular tests
  mpegaudio: sanitise compute_antialias_* names
  mpeg12: add slice-threading checks to slice-threading initializers.
  h264: copy pixel_shift between slice threading contexts.
  mdec: enable frame-level multithreading.
  mdec.c: fix overread.

Conflicts:
	libavcodec/aacdec.c
	libavcodec/ac3dec.c
	libavcodec/avcodec.h
	libavcodec/dca.c
	libavcodec/h264.c
	libavcodec/mdec.c
	libavcodec/mpeg12.c
	libavcodec/options.c
	libavcodec/version.h
	libavcodec/vorbisdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-05-19 06:00:31 +02:00
..
ac3_fixed ac3enc: correct the flipped sign in the ac3_fixed encoder 2011-04-26 17:19:37 -04:00
adpcm_ima_qt adpcmenc: fix QT IMA ADPCM encoder 2011-05-08 13:15:48 +02:00
adpcm_ima_wav tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
adpcm_ms tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
adpcm_swf tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
adpcm_yam tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
alac tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
aref fate: run aref and vref as regular tests 2011-05-18 14:45:46 +01:00
flac tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
g726 Set a constant frame size for encoding G.726 audio. 2010-09-11 19:52:09 +00:00
mp2 tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
pcm matroskaenc: don't write an empty Cues element. 2011-04-07 18:11:24 +02:00
wmav1 tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00
wmav2 tiny_psnr: skip wav headers on input files 2010-07-09 16:06:05 +00:00