Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Mar 2012 22:47:44 +0000 (23:47 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 21 Mar 2012 23:40:11 +0000 (00:40 +0100)
commit967facb6950549d0cc4e0ba79a056ebc6f93a049
tree872266e5d486be0ab8cf9e378bf567c191fba71a
parentf1fdd208cc0a1fce7aaaf6b0fe72b013525f49e0
parent6aba117f1273c7704312c6d892c9f552fa0661bb
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>
43 files changed:
configure
libavcodec/Makefile
libavcodec/aacenc.c
libavcodec/aacenc.h
libavcodec/ac3enc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavcodec/ac3enc_template.c
libavcodec/adpcmenc.c
libavcodec/adxenc.c
libavcodec/flacenc.c
libavcodec/g726.c
libavcodec/indeo4.c
libavcodec/libfaac.c
libavcodec/libgsm.c
libavcodec/libmp3lame.c
libavcodec/libopencore-amr.c
libavcodec/libspeexenc.c
libavcodec/libvo-aacenc.c
libavcodec/libvo-amrwbenc.c
libavcodec/libvorbis.c
libavcodec/mpegaudioenc.c
libavcodec/nellymoserenc.c
libavcodec/ra144.h
libavcodec/ra144enc.c
libavcodec/roqaudioenc.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/lavf/wtv
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
tests/ref/seek/lavf_wtv