ffmpeg/tests/ref
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
..
acodec Merge remote-tracking branch 'qatar/master' 2012-03-22 00:40:11 +01:00
fate Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
lavf Merge remote-tracking branch 'qatar/master' 2012-03-22 00:40:11 +01:00
lavf-fate lavf-fate-ogg_vp3: Try -idct auto instead of -idct simple. 2012-02-18 21:45:07 +01:00
lavfi vf_pad: port to new drawutils API. 2012-03-21 15:52:45 +01:00
seek Merge remote-tracking branch 'qatar/master' 2012-03-22 00:40:11 +01:00
vsynth1 Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
vsynth2 Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00