Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jan 2012 00:33:31 +0000 (01:33 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 21 Jan 2012 00:33:31 +0000 (01:33 +0100)
commit8f0768cc22788357f603695b86f5e9013652bba6
treeaece6cab293d489b857d02d206d90e56ace4eade
parent01084336b7b969e29f163699a8414a84d00295da
parent23e57d167a87d3a671fe25efb2d5a1cf1719efc6
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  Add a tool that uses avio to read and write, doing a plain copy of data
  ARM: fix build with FFT enabled and MDCT disabled
  lavf: force single-threaded decoding in avformat_find_stream_info
  avidec: migrate last of lavf from FF_ER_* to AV_EF_*
  avserver: fix build after the next bump.

Conflicts:
libavformat/Makefile
libavformat/avidec.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
ffserver.c
libavcodec/arm/fft_init_arm.c
libavformat/Makefile
libavformat/avidec.c
libavformat/utils.c