1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
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
..
2012-03-15 22:07:54 +01:00
2012-03-07 12:16:36 -08:00
2012-03-20 18:46:56 -04:00
2012-03-21 18:09:26 +01:00
2012-02-20 15:08:41 -05:00
2012-01-14 01:17:06 +01:00
2012-03-21 04:18:34 +01:00
2012-01-14 04:47:27 +01:00
2012-03-21 03:03:33 +01:00
2012-03-15 22:12:02 +01:00
2012-03-15 22:12:02 +01:00
2012-01-14 01:15:42 +01:00
2012-03-18 02:57:25 +01:00
2012-03-13 01:14:04 +01:00
2012-03-20 18:46:56 -04:00
2012-03-21 03:09:58 +01:00
2012-03-20 00:29:34 +01:00
2012-02-24 03:30:42 +01:00
2012-03-02 18:58:19 +02:00
2012-03-20 18:47:23 -04:00
2012-02-20 15:08:41 -05:00
2012-02-01 04:43:06 +01:00
2012-03-15 22:17:36 +01:00
2012-02-24 04:12:40 +01:00
2012-02-14 01:22:38 +01:00
2012-03-03 04:14:37 +01:00
2012-03-21 22:19:23 +01:00
2012-03-18 14:06:59 +01:00
2012-03-13 22:38:45 +01:00
2012-03-13 01:14:04 +01:00
2012-02-24 04:13:01 +01:00
2012-03-19 18:46:34 +01:00
2012-03-19 18:46:34 +01:00
2012-02-14 19:03:10 +01:00
2012-03-06 10:47:42 -08:00
2012-03-07 10:29:52 -08:00
2012-03-21 02:54:49 +01:00
2012-03-21 03:07:43 +01:00
2012-02-16 06:25:32 +01:00
2012-03-19 22:37:06 +01:00
2012-03-16 15:11:18 +01:00
2012-03-09 09:17:07 +01:00
2012-03-21 03:39:14 +01:00
2012-02-23 23:38:20 +01:00
2012-02-23 23:42:04 +01:00
2012-03-13 01:14:04 +01:00
2012-03-13 01:14:04 +01:00
2012-03-02 08:26:36 +01:00
2012-03-17 15:45:04 -04:00
2012-01-23 19:04:35 +01:00
2012-03-18 07:45:41 -07:00
2012-02-25 07:45:06 +01:00
2012-03-21 03:09:04 +01:00
2012-02-23 23:40:51 +01:00
2012-03-21 04:12:48 +01:00