virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-03 05:10:03 +02:00
Code Issues Releases Activity
337fa0dbe7
FFmpeg/tests/ref/acodec
History
Michael Niedermayer 268098d8b2 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (29 commits)
  amrwb: remove duplicate arguments from extrapolate_isf().
  amrwb: error out early if mode is invalid.
  h264: change underread for 10bit QPEL to overread.
  matroska: check buffer size for RM-style byte reordering.
  vp8: disable mmx functions with sse/sse2 counterparts on x86-64.
  vp8: change int stride to ptrdiff_t stride.
  wma: fix invalid buffer size assumptions causing random overreads.
  Windows Media Audio Lossless decoder
  rv10/20: Fix slice overflow with checked bitstream reader.
  h263dec: Disallow width/height changing with frame threads.
  rv10/20: Fix a buffer overread caused by losing track of the remaining buffer size.
  rmdec: Honor .RMF tag size rather than assuming 18.
  g722: Fix the QMF scaling
  r3d: don't set codec timebase.
  electronicarts: set timebase for tgv video.
  electronicarts: parse the framerate for cmv video.
  ogg: don't set codec timebase
  electronicarts: don't set codec timebase
  avs: don't set codec timebase
  wavpack: Fix an integer overflow
  ...

Conflicts:
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/msmpeg4.c
	libavcodec/pnmdec.c
	libavcodec/qpeg.c
	libavcodec/rawenc.c
	libavcodec/ulti.c
	libavcodec/vcr1.c
	libavcodec/version.h
	libavcodec/wmalosslessdec.c
	libavformat/electronicarts.c
	libswscale/ppc/yuv2rgb_altivec.c
	tests/ref/acodec/g722
	tests/ref/fate/ea-cmv

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-03 00:23:10 +01:00
..
ac3_fixed fate: make acodec-ac3_fixed test output raw AC3 2012-02-02 14:31:54 +00:00
adpcm_adx fate: add ADX encoding/decoding test 2012-01-03 18:47:42 -05:00
adpcm_ima_qt
adpcm_ima_wav
adpcm_ms
adpcm_swf
adpcm_yam adpcmenc: Use correct frame_size for Yamaha ADPCM. 2012-02-20 15:52:32 -05:00
alac Merge remote-tracking branch 'qatar/master' 2012-02-12 01:06:13 +01:00
aref
flac
g722 Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
g723_1
g726
mp2
pcm_alaw fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f32be fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f32le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f64be fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_f64le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_mulaw fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_s8 Revert "movenc: simplify handling of pcm vs. adpcm vs. other compressed codecs" 2012-01-22 23:40:24 +01:00
pcm_s16be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s16le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_s24be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s24daud Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
pcm_s24le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_s32be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s32le fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
pcm_u8 fate: split acodec-pcm into individual tests 2011-12-01 13:27:56 -05:00
wmav1
wmav2