ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-10-02 11:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
b62b9df798
FFmpeg/tests/ref/acodec
History
Michael Niedermayer 967facb695 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (26 commits)
  adxenc: use AVCodec.encode2()
  adxenc: Use the AVFrame in ADXContext for coded_frame
  indeo4: fix out-of-bounds function call.
  configure: Restructure help output.
  configure: Internal-only components should not be command-line selectable.
  vorbisenc: use AVCodec.encode2()
  libvorbis: use AVCodec.encode2()
  libopencore-amrnbenc: use AVCodec.encode2()
  ra144enc: use AVCodec.encode2()
  nellymoserenc: use AVCodec.encode2()
  roqaudioenc: use AVCodec.encode2()
  libspeex: use AVCodec.encode2()
  libvo_amrwbenc: use AVCodec.encode2()
  libvo_aacenc: use AVCodec.encode2()
  wmaenc: use AVCodec.encode2()
  mpegaudioenc: use AVCodec.encode2()
  libmp3lame: use AVCodec.encode2()
  libgsmenc: use AVCodec.encode2()
  libfaac: use AVCodec.encode2()
  g726enc: use AVCodec.encode2()
  ...

Conflicts:
	configure
	libavcodec/Makefile
	libavcodec/ac3enc.c
	libavcodec/adxenc.c
	libavcodec/libgsm.c
	libavcodec/libvorbis.c
	libavcodec/vorbisenc.c
	libavcodec/wmaenc.c
	tests/ref/acodec/g722
	tests/ref/lavf/asf
	tests/ref/lavf/ffm
	tests/ref/lavf/mkv
	tests/ref/lavf/mpg
	tests/ref/lavf/rm
	tests/ref/lavf/ts
	tests/ref/seek/lavf_asf
	tests/ref/seek/lavf_ffm
	tests/ref/seek/lavf_mkv
	tests/ref/seek/lavf_mpg
	tests/ref/seek/lavf_rm
	tests/ref/seek/lavf_ts

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22 00:40:11 +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-22 00:40:11 +01:00
g723_1
g726
mp2
pcm_alaw
pcm_f32be
pcm_f32le
pcm_f64be
pcm_f64le
pcm_mulaw
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
pcm_s24be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s24daud
pcm_s24le
pcm_s32be movenc: Decrease default chunk merge limit to 1mb. 2012-01-23 23:41:32 +01:00
pcm_s32le
pcm_u8