Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Dec 2011 00:23:15 +0000 (01:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Dec 2011 00:23:15 +0000 (01:23 +0100)
commit175cc378b3bd970caf1641e5df3361d6233747e1
treed237cb08b1b6909154a007d3c06f0dab61b9700f
parent56669837ce18d15d757a144712a082b9cb535c94
parentd3b8bde2f14f78109a892e57f544bf840cf6d4fc
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Rudimentary IODs support.
  v410enc: fix output buffer size check
  v410enc: include correct headers
  fate: add -pix_fmt rgb48le to r210 test
  flvenc: Support muxing 16 kHz nellymoser
  configure: refactor list of programs into a variable
  fate: add r210 decoder test
  fate: split off Indeo FATE tests into their own file
  fate: split off ATRAC FATE tests into their own file
  fate: Add FATE tests for v410 encoder and decoder
  ARM: fix external symbol refs in rv40 asm
  westwood: Make sure audio header info is present when parsing audio packets
  libgsm: Reset the MS mode of GSM in the flush function
  libgsm: Set options on the right object
  ARM: dca: disable optimised decode_blockcodes() for old gcc

Conflicts:
configure
libavformat/movenc.c
libavformat/movenc.h
tests/fate2.mak
tests/ref/acodec/alac
tests/ref/vsynth1/mpeg4
tests/ref/vsynth2/mpeg4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
configure
libavcodec/libgsm.c
libavcodec/v410enc.c
libavformat/flvenc.c
libavformat/movenc.c
libavformat/movenc.h
libavformat/westwood.c
tests/Makefile
tests/fate.mak
tests/ref/acodec/alac
tests/ref/vsynth1/mpeg4
tests/ref/vsynth2/mpeg4